]> git.donarmstrong.com Git - debhelper.git/commitdiff
logic simplification
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 28 Oct 2009 22:22:44 +0000 (18:22 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 28 Oct 2009 22:22:44 +0000 (18:22 -0400)
dh

diff --git a/dh b/dh
index 8e781b6a0bbfcbb908409ecab9ff07ebdfd40aa2..775e94921d90b64a39d89f391fcaf2a6f18b7aeb 100755 (executable)
--- a/dh
+++ b/dh
@@ -239,9 +239,9 @@ inhibit_log();
 # server. 
 if (is_make_jobserver_unavailable()) {
        clean_jobserver_makeflags();
-       # Enable parallel (no maximum) if a value was not previously
+       # Implicitly enable parallel (no maximum) if a value was not previously
        # specified.
-       $dh{PARALLEL} = 0 if !defined $dh{PARALLEL};
+       $dh{PARALLEL} = 0 unless defined $dh{PARALLEL};
 }
 
 # Definitions of sequences.
@@ -536,8 +536,8 @@ sub run {
        # to prevent them from being acted on.
        push @options, map { "-N$_" } @exclude;
 
-       # Pass --parallel to dh_auto_* commands if requested
-       if (defined $dh{PARALLEL} && ($dh{PARALLEL} == 0 || $dh{PARALLEL} > 1)
+       # Pass --parallel to dh_auto_* commands.
+       if (defined $dh{PARALLEL} && $dh{PARALLEL} != 1
            && $command =~ /^dh_auto_/) {
                push @options, "--parallel" . ($dh{PARALLEL} > 1 ? "=$dh{PARALLEL}" : "");
        }