From 7d75bde672c71c2260891a6bf8a9e70be8bfd638 Mon Sep 17 00:00:00 2001
From: Ole Tange <ole@tange.dk>
Date: Wed, 11 Jan 2012 23:07:31 +0100
Subject: [PATCH] parallel: Fixed regression bug.

---
 src/parallel                     | 7 +++++--
 testsuite/tests-to-run/test45.sh | 2 +-
 testsuite/wanted-results/test45  | 5 ++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/parallel b/src/parallel
index 809de8fe..56f76488 100755
--- a/src/parallel
+++ b/src/parallel
@@ -541,7 +541,7 @@ sub get_options_from_array {
 sub parse_options {
     # Returns: N/A
     # Defaults:
-    $Global::version = 20120107;
+    $Global::version = 20120111;
     $Global::progname = 'parallel';
     $Global::infinity = 2**31;
     $Global::debug = 0;
@@ -4684,7 +4684,10 @@ sub nest_get {
     # forget the value after first use.
     if($no_of_inputsources == 1) {
 	my $arg = read_arg_from_fh($self->{'fhs'}[0]);
-	return [$arg];
+	if(defined($arg)) {
+	    return [$arg];
+	}
+	return undef;
     }
     for (my $fhno = $no_of_inputsources - 1; $fhno >= 0; $fhno--) {
 	if(eof($self->{'fhs'}[$fhno])) {
diff --git a/testsuite/tests-to-run/test45.sh b/testsuite/tests-to-run/test45.sh
index 3380e565..e2c7ee89 100644
--- a/testsuite/tests-to-run/test45.sh
+++ b/testsuite/tests-to-run/test45.sh
@@ -33,7 +33,7 @@ echo '### Bug in --load';
   parallel -k --load 30 sleep 0.1\;echo ::: 1 2 3
 
 echo '### Test --timeout'; 
-  parallel -j0 -k --timeout 1 echo {}\; sleep {}\; echo {} ::: 1.1 3.3 4.4 5.5
+  parallel -j0 -k --timeout 1 echo {}\; sleep {}\; echo {} ::: 1.1 6.6 7.7 8.8
 
 echo '### Test retired'; 
   stdout parallel -B; 
diff --git a/testsuite/wanted-results/test45 b/testsuite/wanted-results/test45
index a2a89676..5d83491e 100644
--- a/testsuite/wanted-results/test45
+++ b/testsuite/wanted-results/test45
@@ -16,10 +16,9 @@ OK
 ### Test --timeout
 1.1
 1.1
-3.3
-3.3
-4.4
 5.5
+6.6
+7.7
 ### Test retired
 parallel: -g has been retired. Use --group.
 parallel: -B has been retired. Use --bf.