coren has submitted this change and it was merged.

Change subject: Make jsub obey -q even when -continuous specified
......................................................................


Make jsub obey -q even when -continuous specified

To allow usage of custom queues.

Change-Id: I669be7e1f5cdbdc8a7191902e80e073ca83466d7
---
M debian/changelog
M jobutils/bin/jsub
2 files changed, 8 insertions(+), 1 deletion(-)

Approvals:
  coren: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index 48b875e..262df44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+toollabs (1.0.5) unstable; urgency=low
+
+  * Marc-André Pelletier: jsub should allow -q to override
+    the queue name even when -continuous is used
+
+ -- Marc-André Pelletier <[email protected]>  Thu, 5 Sep 2013 14:37:35 
-0400
+
 toollabs (1.0.4) unstable; urgency=low
 
   * Marc-André Pelletier: make jsub accept -M and -m for
diff --git a/jobutils/bin/jsub b/jobutils/bin/jsub
index 4c6098a..9ed5413 100755
--- a/jobutils/bin/jsub
+++ b/jobutils/bin/jsub
@@ -234,7 +234,7 @@
 my ($qsubinput, $qsuboutput, $qsuberror);
 
 if($continuous) {
-  push @args, '-q', 'continuous';
+  push @args, '-q', (defined $qsargs{'-q'})? $qsargs{'-q'}: 'continuous';
   push @args, '-b', $qsargs{'-b'} if defined $qsargs{'-b'};
   $qsubinput = "#!/bin/bash\n"                                   .
                "while ! " . shell_quote($prog, @ARGV) . "; do\n" .

-- 
To view, visit https://gerrit.wikimedia.org/r/82881
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I669be7e1f5cdbdc8a7191902e80e073ca83466d7
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: coren <[email protected]>
Gerrit-Reviewer: coren <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to