Adding safeguards for clean and archive commands

Author: akashdhruv

jobrunner/cli/_commands.py

@@ -2,6 +2,7 @@
 
 # Standard libraries
 from datetime import date
+import subprocess
 
 # Feature libraries
 import click

jobrunner/lib/_archivetools.py

@@ -63,7 +63,11 @@ def CreateArchive(config, archive_tag):
 
                 # loop over archive_list and archive contents
                 for filename in archive_list:
-                    shutil.move(filename, nodedir + os.sep + archive_tag)
+                    if os.path.exists(filename + os.sep + "Jobfile"):
+                        print(f'{" "*4}[jobrunner] Cannot archive {filename} SKIPPING')
+                        continue
+                    else:
+                        shutil.move(filename, nodedir + os.sep + archive_tag)
 
     # return back to working directory
     os.chdir(config.job.workdir)

jobrunner/lib/_filetools.py

@@ -248,7 +248,11 @@ def RemoveNodeFiles(config, nodedir):
             if os.path.isfile(filename):
                 os.remove(filename)
             elif os.path.isdir(filename):
-                shutil.rmtree(filename)
+                if os.path.exists(filename + os.sep + "Jobfile"):
+                    print(f'{" "*4}[jobrunner] Cannot remove node {filename} SKIPPING')
+                    continue
+                else:
+                    shutil.rmtree(filename)
 
     # return back to working directory
     os.chdir(config.job.workdir)