[SCM] dpkg's main repository branch, master, updated. 1.16.5

[Guillem Jover]

The following commit has been merged in the master branch:
commit f73bc73425fc1775b64815e3943aad8107711f5b
Author: Bernhard R. Link <brl...@debian.org>
Date:   Sun Jun 17 09:00:30 2012 +0200

    dpkg-buildflags: Coalesce --list and --dump option parsing
    
    Signed-off-by: Bernhard R. Link <brl...@debian.org>
    Signed-off-by: Guillem Jover <guil...@debian.org>

diff --git a/scripts/dpkg-buildflags.pl b/scripts/dpkg-buildflags.pl
index 2afb1c0..c273615 100755
--- a/scripts/dpkg-buildflags.pl
+++ b/scripts/dpkg-buildflags.pl
@@ -72,14 +72,10 @@ while (@ARGV) {
             if defined($action);
         my $type = $1 || "sh";
         $action = "export-$type";
-    } elsif (m/^--dump$/) {
-        usageerr(_g("two commands specified: --%s and --%s"), "dump", $action)
-            if defined($action);
-        $action = "dump";
-    } elsif (m/^--list$/) {
-        usageerr(_g("two commands specified: --%s and --%s"), "list", $action)
+    } elsif (m/^--(list|dump)$/) {
+        usageerr(_g("two commands specified: --%s and --%s"), $1, $action)
             if defined($action);
-        $action = "list";
+        $action = $1;
     } elsif (m/^-(h|-help)$/) {
         usage();
         exit 0;

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org