[RARSLAVE] Fix delete_list()

[rarslave2.git] / rarslave.py

diff --git a/rarslave.py b/rarslave.py
index 5be2b2f..eb133a1 100644 (file)
--- a/rarslave.py
+++ b/rarslave.py
@@ -405,7 +405,7 @@ class PAR2Set (object):
                # Deletion Stage
                DELETE_INTERACTIVE = options.interactive
                deleteable_files = find_deleteable_files (self.likely_files)
-               ret = delete_list (deleteable_files, DELETE_INTERACTIVE)
+               ret = delete_list (self.dir, deleteable_files, DELETE_INTERACTIVE)
 
                if ret != SUCCESS:
                        logger.addMessage ('Deletion stage failed for: %s' % par2head, RarslaveLogger.MessageType.Fatal)
@@ -414,9 +414,11 @@ class PAR2Set (object):
                logger.addMessage ('Successfully completed: %s' % par2head)
                return SUCCESS
 
-def delete_list (files, interactive=False):
+def delete_list (dir, files, interactive=False):
        # Delete a list of files
 
+       assert os.path.isdir (dir)
+
        done = False
        valid_y = ['Y', 'YES']
        valid_n = ['N', 'NO']
@@ -433,7 +435,7 @@ def delete_list (files, interactive=False):
                        return SUCCESS
 
        for f in files:
-               os.remove (f)
+               os.remove (os.path.join (dir, f))
 
        return SUCCESS