bump version

cronwrapper/__init__.py

@@ -79,7 +79,7 @@ def parse_args():
 
     args = parser.parse_args()
     if not args.name:
-        args.name = [os.path.basename(args.command[0])]
+        args.name = os.path.basename(args.command[0])
 
     return args
 
@@ -159,7 +159,10 @@ def print_runs(runs, clean=True):
         print("\n\n")
     if clean:
         for run in runs:
+            try:
                 shutil.rmtree(run)
+            except FileNotFoundError:
+                pass
 
 def main():
     time_format = '%Y-%m-%d_%H%M'
@@ -204,10 +207,16 @@ def main():
 
     previous_runs = {}
     for root, dirs, files in os.walk(os.path.join(args.cachedir[0], args.name)):
-        previous_runs = {
-                os.path.join(root, d): datetime.datetime.strptime(d, time_format) 
-                for d in dirs 
-                if datetime.datetime.strptime(d, time_format) < datetime.datetime.strptime(nowstr, time_format)}
+        for d in dirs:
+            if datetime.datetime.strptime(d, time_format) < datetime.datetime.strptime(nowstr, time_format):
+                with open(os.path.join(root, d, 'result'), 'r') as f:
+                    try:
+                        retcode = f.read().splitlines()[-1]
+                    except IndexError:
+                        # Previous run is probably not completed yet, ignore
+                        # this entry
+                        continue
+                previous_runs[os.path.join(root, d)] = datetime.datetime.strptime(d, time_format)
         break
 
     if success:
@@ -215,7 +224,10 @@ def main():
         if previous_runs:
             print("Success after {} failed runs\n".format(len(previous_runs)))
             print_runs(previous_runs.keys())
+        try:
             shutil.rmtree(libdir)
+        except FileNotFoundError:
+            pass
         return 0 
 
 

setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r') as fh:
 
 setuptools.setup(
         name='cronwrapper',
-        version='0.1.1',
+        version='0.1.4',
         author='Fredrik Eriksson',
         author_email='feffe@fulh.ax',
         description='A small wrapper to handle cronjob failures',