Fixed type and tried something

I hate when I do that ;p

Author: mgermain

scripts/smart_dispatch.py

@@ -44,9 +44,9 @@ def main():
         commands = smartdispatch.replace_uid_tag(commands)
         nb_commands = len(commands)  # For print at the end
 
-        path_job_logs, path_job_commands = create_job_folders(jobname)
+        path_job, path_job_logs, path_job_commands = create_job_folders(jobname)
     elif args.mode == "resume":
-        path_job_logs, path_job_commands = get_job_folders(args.batch_uid)
+        path_job, path_job_logs, path_job_commands = get_job_folders(args.batch_uid)
     else:
         raise ValueError("Unknown subcommand!")
 
@@ -85,18 +85,18 @@ def main():
     pbs_filenames = job_generator.write_pbs_files(path_job_commands)
 
     # Launch the jobs
-    print "{nb_commands} command(s) will be executed in {nb_jobs} job(s).".format(nb_commands=nb_commands, nb_jobs=len(pbs_filenames))
+    print "## {nb_commands} command(s) will be executed in {nb_jobs} job(s) ##".format(nb_commands=nb_commands, nb_jobs=len(pbs_filenames))
     print "Batch UID: {batch_uid}".format(batch_uid=jobname)
     if not args.doNotLaunch:
-        job_ids = []
+        jobs_id = []
         for pbs_filename in pbs_filenames:
             qsub_output = check_output('{launcher} {pbs_filename}'.format(launcher=LAUNCHER if args.launcher is None else args.launcher, pbs_filename=pbs_filename), shell=True)
-            job_ids += [qsub_output.rstrip()]
+            jobs_id += [qsub_output.rstrip()]
 
-        with utils.open_with_lock(os.path.join(path_job_commands, "job_ids.txt"), 'a') as job_ids_file:
-            job_ids_file.writelines(job_ids)
-        print "\nJob id's: {job_ids}".format(job_ids=" ".join(job_ids))
-    print "\nLogs, command, and job id's related to this batch will be in: {smartdispatch_folder}/{{Batch UID}}".format(smartdispatch_folder=LOGS_FOLDERNAME)
+        with utils.open_with_lock(os.path.join(path_job, "job_ids.txt"), 'a') as jobs_id_file:
+            jobs_id_file.writelines("\n".join(jobs_id))
+        print "\nJobs id: {jobs_id}".format(jobs_id=" ".join(jobs_id))
+    print "\nLogs, command, and jobs id related to this batch will be in: {smartdispatch_folder}/{{Batch UID}}".format(smartdispatch_folder=path_job)
 
 
 def parse_arguments():
@@ -146,32 +146,32 @@ def _gen_job_paths(jobname):
     path_job_logs = os.path.join(path_job, 'logs')
     path_job_commands = os.path.join(path_job, 'commands')
 
-    return path_job_logs, path_job_commands
+    return path_job, path_job_logs, path_job_commands
 
 
 def get_job_folders(jobname):
-    path_job_logs, path_job_commands = _gen_job_paths(jobname)
+    path_job, path_job_logs, path_job_commands = _gen_job_paths(jobname)
 
     if not os.path.exists(path_job_commands):
         raise LookupError("Batch UID ({0}) does not exist! Cannot resume.".format(jobname))
 
     if not os.path.exists(path_job_logs):
         os.makedirs(path_job_logs)
 
-    return path_job_logs, path_job_commands
+    return path_job, path_job_logs, path_job_commands
 
 
 def create_job_folders(jobname):
     """Creates the folders where the logs, commands and QSUB files will be saved."""
-    path_job_logs, path_job_commands = _gen_job_paths(jobname)
+    path_job, path_job_logs, path_job_commands = _gen_job_paths(jobname)
 
     if not os.path.exists(path_job_commands):
         os.makedirs(path_job_commands)
 
     if not os.path.exists(path_job_logs):
         os.makedirs(path_job_logs)
 
-    return path_job_logs, path_job_commands
+    return path_job, path_job_logs, path_job_commands
 
 
 if __name__ == "__main__":