Fix some merge errors

A few merge errors happened during prior commits duplicating some code blocks. I reverted bugfix-change-log-ownership-after-policy-run back to a prior commit with the correct changes. This still contains all of the changes from !17 (merged), !18 (closed), and !19 (merged).

src/run-policy/run-submit-pol-job.py

@@ -36,6 +36,10 @@ def parse_args():
                         help='Time limit for job formatted as [D-]HH:MM:SS')
     sbatch.add_argument('-m','--mem-per-cpu',type=str,default='8G',
                         help='Amount of RAM to allocate per core')
+
+    parser.add_argument('--dry-run', action='store_true',
+                        help="Do not submit any jobs, run any policies, or create or remove any files or directories."
+                             "Used for testing")
     
     parser.add_argument('device',type=str,
                         help="GPFS fileset/directory apply the policy to. Can be specified as either the name of the"
@@ -106,11 +110,8 @@ def validate_output_directory(outdir):
     return p
 
 def create_default_log_prefix(device):
-    if device.match('/data/user'):
-        log_prefix = 'list-policy_data_user'
-    else:
-        log_prefix = f'list-policy_{device.stem}'
-    return log_prefix
+    mod_device = str(device).strip('/').replace('/','-')
+    return f"list-policy_{mod_device}"
 
 def main():
     args = parse_args()
@@ -135,7 +136,10 @@ def main():
     else:
         args['policy'] = './policy-def/list-path-external'
 
-    cmd = "./submit-pol-job -o {outdir} -f {log_prefix} -P {policy} -N {nodes} -c {cores} -p {partition} -t {time} -m {mem_per_cpu} {device}".format(**args)
+    if args['dry_run']:
+        cmd = "./submit-pol-job -o {outdir} -f {log_prefix} -P {policy} -N {nodes} -c {cores} -p {partition} -t {time} -m {mem_per_cpu} --dry-run {device}".format(**args)
+    else:
+        cmd = "./submit-pol-job -o {outdir} -f {log_prefix} -P {policy} -N {nodes} -c {cores} -p {partition} -t {time} -m {mem_per_cpu} {device}".format(**args)
     
     print(f"Command: {cmd}")
     subprocess.run(cmd,shell=True)