X-Git-Url: https://www.irasnyder.com/gitweb/?p=rarslave2.git;a=blobdiff_plain;f=rarslave.py;h=657fa7247e262701863720e8a762f1916461893b;hp=739fdc7d64e688e2e028b6b3b585d34596f62d12;hb=f1d2c2eb0d60addd6e99e7877a9e77ee1223f674;hpb=dd2cdbcf934f25727bc940e4f5ee440c63ef16b6 diff --git a/rarslave.py b/rarslave.py index 739fdc7..657fa72 100644 --- a/rarslave.py +++ b/rarslave.py @@ -26,10 +26,7 @@ class RarslaveExtractor (object): def addHead (self, dir, head): assert os.path.isdir (dir) - # REQUIRES that the dir is valid, but not that the file is valid, so that - # we can move a file that doesn't exist yet. - # FIXME: probably CAN add this back, since we should be running this AFTER repair. - #assert os.path.isfile (os.path.join (dir, head)) + assert os.path.isfile (os.path.join (dir, head)) full_head = os.path.join (dir, head) logger.addMessage ('Adding extraction head: %s' % full_head, RarslaveLogger.MessageType.Debug) @@ -173,12 +170,7 @@ def run_command (cmd, indir=None): assert os.path.isdir (indir) # MUST be a directory! os.chdir (indir) - # FIXME: re-enable this after testing - print 'RUNNING (%s): %s' % (indir, cmd) - return SUCCESS - - # return os.system (cmd) - + return os.system (cmd) def full_abspath (p): return os.path.abspath (os.path.expanduser (p)) @@ -439,9 +431,7 @@ def delete_list (files, interactive=False): return SUCCESS for f in files: - # FIXME: re-enable this in production - # os.remove (f) - print 'rm \"%s\"' % f + os.remove (f) return SUCCESS