From 4e88a2c010f17d9083097fd03073ee286ee23307 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Thu, 26 May 2016 15:38:59 -0700
Subject: [PATCH] In qsub explicitly set --no-requeue when -r n is given.

---
 contribs/torque/qsub.pl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/contribs/torque/qsub.pl b/contribs/torque/qsub.pl
index 1a5d88a4e76..26226787c0f 100755
--- a/contribs/torque/qsub.pl
+++ b/contribs/torque/qsub.pl
@@ -353,7 +353,14 @@ $command .= " -J $job_name" if $job_name;
 $command .= " --nice=$priority" if $priority;
 $command .= " -p $destination" if $destination;
 $command .= " --wckey=$wckey" if $wckey;
-$command .= " --requeue" if $requeue && $requeue =~ 'y';
+
+if ($requeue) {
+	if ($requeue =~ 'y') {
+		$command .= " --requeue";
+	} elsif ($requeue =~ 'n') {
+		$command .= " --no-requeue"
+	}
+}
 
 if ($script) {
 	if ($wrap && $wrap =~ 'y') {
-- 
GitLab