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

scripts: Change version() functions to never exit

Guillem Jover лет назад: 11
Родитель
Сommit
208b323fd2
3 измененных файлов с 3 добавлено и 6 удалено
  1. 1 2
      scripts/dpkg-checkbuilddeps.pl
  2. 1 2
      scripts/dpkg-scanpackages.pl
  3. 1 2
      scripts/dpkg-scansources.pl

+ 1 - 2
scripts/dpkg-checkbuilddeps.pl

@@ -37,7 +37,6 @@ textdomain('dpkg-dev');
 sub version()
 {
     printf g_("Debian %s version %s.\n"), $Dpkg::PROGNAME, $Dpkg::PROGVERSION;
-	exit(0);
 }
 
 sub usage {
@@ -70,7 +69,7 @@ my $host_arch = get_host_arch();
 my $admindir = $Dpkg::ADMINDIR;
 my @options_spec = (
     'help|?' => sub { usage(); exit(0); },
-    'version' => \&version,
+    'version' => sub { version(); exit 0; },
     'A' => \$ignore_bd_arch,
     'B' => \$ignore_bd_indep,
     'd=s' => \$bd_value,

+ 1 - 2
scripts/dpkg-scanpackages.pl

@@ -44,7 +44,7 @@ my %overridden;
 my %hash;
 
 my %options = (help            => sub { usage(); exit 0; },
-	       version         => \&version,
+	       version         => sub { version(); exit 0; },
 	       type            => undef,
 	       arch            => undef,
 	       hash            => undef,
@@ -66,7 +66,6 @@ my @options_spec = (
 
 sub version {
     printf g_("Debian %s version %s.\n"), $Dpkg::PROGNAME, $Dpkg::PROGVERSION;
-    exit;
 }
 
 sub usage {

+ 1 - 2
scripts/dpkg-scansources.pl

@@ -66,10 +66,10 @@ my $extra_override_file = undef;
 my @option_spec = (
     'debug!' => \$debug,
     'help|?' => sub { usage(); exit 0; },
+    'version' => sub { version(); exit 0; },
     'no-sort|n' => \$no_sort,
     'source-override|s=s' => \$src_override,
     'extra-override|e=s' => \$extra_override_file,
-    'version' => \&version,
 );
 
 sub debug {
@@ -78,7 +78,6 @@ sub debug {
 
 sub version {
     printf g_("Debian %s version %s.\n"), $Dpkg::PROGNAME, $Dpkg::PROGVERSION;
-    exit;
 }
 
 sub usage {