Fix qdo job name setting.

util/qdo:
    Don't automatically set qsub job name, as this causes qsub to fail
    if the job name is too long or otherwise unsuitable.

--HG--
extra : convert_revision : 5ba48767574efaaff2c328549adee295780f7f70

1 files changed, 7 insertions, 3 deletions

diff --git a/util/qdo b/util/qdo
index 9593ed5ed..339d944a7 100755
--- a/util/qdo
+++ b/util/qdo
@@ -60,8 +60,11 @@ if cmd == []:
     print >>sys.stderr, "%s: missing command" % progname
     sys.exit(1)
 
-if not options.job_name:
-    options.job_name = cmd[0]
+# If we want to do this, need to add check here to make sure cmd[0] is
+# a valid PBS job name, else qsub will die on us.
+#
+#if not options.job_name:
+#    options.job_name = cmd[0]
 
 cwd = os.getcwd()
 
@@ -144,7 +147,8 @@ if False and len(cmd) > 50:
     print "%s: running %s on poolfs" % (progname, cmd[0])
 else:
     shell_cmd = 'qsub -I -S /bin/sh'
-    shell_cmd += ' -N "%s"' % options.job_name
+    if options.job_name:
+        shell_cmd += ' -N "%s"' % options.job_name
     if options.dest_queue:
         shell_cmd += ' -q ' + options.dest_queue