Просмотр исходного кода

dpkg-buildflags: Coalesce --list and --dump option parsing

Signed-off-by: Bernhard R. Link <brlink@debian.org>
Signed-off-by: Guillem Jover <guillem@debian.org>
Bernhard R. Link лет назад: 14
Родитель
Сommit
f73bc73425
1 измененных файлов с 3 добавлено и 7 удалено
  1. 3 7
      scripts/dpkg-buildflags.pl

+ 3 - 7
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;