Explorar el Código

scripts: Move Getopt::Long option specifications to array variables

Guillem Jover hace 13 años
padre
commit
1dbc70121f

+ 4 - 2
scripts/changelog/debian.pl

@@ -89,7 +89,7 @@ sub set_format {
     $format = $val;
 }
 
-GetOptions(
+my @options_spec = (
     'file=s' => \$file,
     'label|l=s' => \$label,
     'since|v=s' => \$since,
@@ -102,7 +102,9 @@ GetOptions(
     'version|V' => sub{version();exit(0)},
     'format=s' => \&set_format,
     'all|a' => \$all,
-)
+);
+
+GetOptions(@options_spec)
     or do { usage(); exit(2) };
 
 usageerr('too many arguments') if @ARGV > 1;

+ 12 - 8
scripts/dpkg-checkbuilddeps.pl

@@ -65,14 +65,18 @@ my $ignore_bd_indep = 0;
 my ($bd_value, $bc_value);
 my $host_arch = get_host_arch();
 my $admindir = $Dpkg::ADMINDIR;
-if (!GetOptions('A' => \$ignore_bd_arch,
-                'B' => \$ignore_bd_indep,
-                'help|?' => sub { usage(); exit(0); },
-                'version' => \&version,
-                'd=s' => \$bd_value,
-                'c=s' => \$bc_value,
-                'a=s' => \$host_arch,
-                'admindir=s' => \$admindir)) {
+my @options_spec = (
+    'help|?' => sub { usage(); exit(0); },
+    'version' => \&version,
+    'A' => \$ignore_bd_arch,
+    'B' => \$ignore_bd_indep,
+    'd=s' => \$bd_value,
+    'c=s' => \$bc_value,
+    'a=s' => \$host_arch,
+    'admindir=s' => \$admindir,
+);
+
+if (!GetOptions(@options_spec)) {
 	usage();
 	exit(2);
 }

+ 8 - 3
scripts/dpkg-mergechangelogs.pl

@@ -72,9 +72,14 @@ Options:
 }
 
 my $merge_prereleases;
-unless (GetOptions('help|?' => sub { usage(); exit(0) },
-		   'merge-prereleases|m' => \$merge_prereleases,
-		   'version' => sub { version(); exit(0) })) {
+
+my @options_spec = (
+    'help|?' => sub { usage(); exit(0) },
+    'version' => sub { version(); exit(0) },
+    'merge-prereleases|m' => \$merge_prereleases,
+);
+
+unless (GetOptions(@options_spec)) {
     usage();
     exit(2);
 }

+ 11 - 4
scripts/dpkg-scanpackages.pl

@@ -52,10 +52,17 @@ my %options = (help            => sub { usage(); exit 0; },
                medium          => undef,
 	      );
 
-my $result = GetOptions(\%options,
-                        'help|?', 'version', 'type|t=s',
-                        'arch|a=s', 'multiversion|m!', 'extra-override|e=s',
-                        'medium|M=s');
+my @options_spec = (
+    'help|?',
+    'version',
+    'type|t=s',
+    'arch|a=s',
+    'multiversion|m!',
+    'extra-override|e=s',
+    'medium|M=s',
+);
+
+my $result = GetOptions(\%options, @options_spec);
 
 sub version {
     printf _g("Debian %s version %s.\n"), $Dpkg::PROGNAME, $Dpkg::PROGVERSION;