From 0f094ba5b26bb30e72c39dc873eb9ae5c639b456 Mon Sep 17 00:00:00 2001
From: Ole Tange <ole@tange.dk>
Date: Sun, 31 Oct 2010 03:11:18 +0100
Subject: [PATCH] Bugfix: sprintf used %d with no matching argument

---
 src/parallel | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/parallel b/src/parallel
index f476b96e..adb6faf7 100755
--- a/src/parallel
+++ b/src/parallel
@@ -153,6 +153,10 @@ files. The arguments can be accessed in the command as B<{1}>
 B<{6}> will refer to the line with the same line number from the 6th
 file.
 
+Example: Print the number on the opposing sides of a six sided die.
+
+B<parallel -a <(seq 6) -a <(seq 6 -1 1) echo>
+
 
 =item B<--arg-file-sep> I<sep-str> (beta testing)
 
@@ -3887,7 +3891,7 @@ sub progress {
 	$header = "Computer:jobs completed";
 	$status = $eta .
 	    join(" ",map
-		       { sprintf("%s:%d/%d",
+		       { sprintf("%s:%d",
 				 $sshlogin{$_},
 				 ($Global::host{$_}{'completed'}||0)) }
 		       @workers);
@@ -3897,7 +3901,7 @@ sub progress {
 	$header = "Computer:jobs completed";
 	$status = $eta .
 	    join(" ",map
-		       { sprintf("%s:%d/%d",
+		       { sprintf("%s:%d",
 				 $workerno{$_},
 				 ($Global::host{$_}{'completed'}||0)) }
 		       @workers);
@@ -4396,6 +4400,8 @@ sub read_sshloginfile {
     open(IN, $file) || die "Cannot open $file";
     while(<IN>) {
 	chomp;
+	/^\s*#/ and next;
+	/^\s*$/ and next;
 	push @Global::sshlogin, $_;
     }
     close IN;