From afcefd1414aefee1ee3563ec57b99e0f5ab8e9e8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20Kr=C3=BCger?= <jk@jk.gs>
Date: Wed, 24 Nov 2010 18:40:32 +0100
Subject: [PATCH] jobd: clean up options documentation and turn off bundling
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

In anticipation of our first option with two values, change
documentation to use "--foo bar" instead of "--foo=bar" because
"--baz=nit fol" looks a bit weird.

Also, since bundling, for some reason, doesn't support even long options
with multiple values, turn it off. Bye-bye, bundling. We'll miss you.

Signed-off-by: Jan Krüger <jk@jk.gs>
---
 jobd/jobd.pl | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/jobd/jobd.pl b/jobd/jobd.pl
index b21a511..70c2e88 100755
--- a/jobd/jobd.pl
+++ b/jobd/jobd.pl
@@ -319,7 +319,6 @@ sub fatal($) {
 ######### Main {{{1
 
 # Parse options
-Getopt::Long::Configure('bundling');
 my $parse_res = GetOptions(
 	'help|?' => sub { pod2usage(-verbose => 1, -exitval => 0); },
 	'quiet|q' => \$quiet,
@@ -370,16 +369,16 @@ jobd [options]
    -h | --help                           detailed instructions
    -q | --quiet                          run quietly
    -P | --progress                       show occasional status updates
-   -k SECONDS | --kill-after=SECONDS     how long to wait before killing jobs
-   -p NUM | --max-parallel=NUM           how many jobs to run at the same time
-   -i NUM | --max-intensive-parallel=NUM how many resource-hungry jobs to run
+   -k SECONDS | --kill-after SECONDS     how long to wait before killing jobs
+   -p NUM | --max-parallel NUM           how many jobs to run at the same time
+   -i NUM | --max-intensive-parallel NUM how many resource-hungry jobs to run
                                          at the same time
-   -d NUM | --restart-delay=NUM          wait for this many seconds between
+   -d NUM | --restart-delay SECONDS      wait for this many seconds between
                                          queue runs
-   -l FILE | --lockfile=FILE             create a lockfile in the given
+   -l FILE | --lockfile FILE             create a lockfile in the given
                                          location
    -a | --all-once                       process the list only once
-   -o PRJNAME | --one=PRJNAME            process only one project
+   -o PRJNAME | --one PRJNAME            process only one project
 
 =head1 OPTIONS
 
@@ -398,25 +397,25 @@ Suppress non-error messages, e.g. for use when running this task as a cronjob.
 Show information about the current status of the job queue occasionally. This
 is automatically enabled if --quiet is not given.
 
-=item B<--kill-after=SECONDS>
+=item B<--kill-after SECONDS>
 
 Kill supervised jobs after a certain time to avoid hanging the daemon.
 
-=item B<--max-parallel=NUM>
+=item B<--max-parallel NUM>
 
 Run no more than that many jobs at the same time.
 
-=item B<--max-intensive-parallel=NUM>
+=item B<--max-intensive-parallel NUM>
 
 Run no more than that many resource-hungry jobs at the same time. Right now,
 this refers to repacking jobs.
 
-=item B<--restart-delay=NUM>
+=item B<--restart-delay NUM>
 
 After processing the queue, wait this many seconds until the queue is
 restarted.
 
-=item B<--lockfile=FILE>
+=item B<--lockfile FILE>
 
 For perpetual operation, create a lockfile in that place and clean it up after
 finishing/aborting.
@@ -426,7 +425,7 @@ finishing/aborting.
 Instead of perpetuously processing all projects over and over again, process
 them just once and then exit.
 
-=item B<--one=PRJNAME>
+=item B<--one PRJNAME>
 
 Process only the given project (given as just the project name without C<.git>
 suffix) and then exit.
-- 
2.11.4.GIT