Przeglądaj źródła

dpkg-buildpackage: use Dpkg::Path::find_command instead of custom testcommand

Raphaël Hertzog 16 lat temu
rodzic
commit
7106a2d148
1 zmienionych plików z 4 dodań i 11 usunięć
  1. 4 11
      scripts/dpkg-buildpackage.pl

+ 4 - 11
scripts/dpkg-buildpackage.pl

@@ -30,6 +30,7 @@ use Dpkg::BuildOptions;
 use Dpkg::Compression;
 use Dpkg::Version;
 use Dpkg::Changelog::Parse;
+use Dpkg::Path qw(find_command);
 
 textdomain("dpkg-dev");
 
@@ -104,9 +105,9 @@ my @rootcommand = ();
 my $signcommand = '';
 if ( ( ($ENV{GNUPGHOME} && -e $ENV{GNUPGHOME})
        || ($ENV{HOME} && -e "$ENV{HOME}/.gnupg") )
-     && testcommand('gpg')) {
+     && find_command('gpg')) {
 	 $signcommand = 'gpg';
-} elsif (testcommand('pgp')) {
+} elsif (find_command('pgp')) {
 	$signcommand = 'pgp'
 }
 
@@ -226,7 +227,7 @@ if ($< == 0) {
 } else {
     push @rootcommand, "fakeroot" unless @rootcommand;
 
-    if (!testcommand($rootcommand[0])) {
+    if (!find_command($rootcommand[0])) {
 	if ($rootcommand[0] eq 'fakeroot') {
 	    error(_g("fakeroot not found, either install the fakeroot\n" .
 	             "package, specify a command with the -r option, " .
@@ -465,14 +466,6 @@ if ($signerrors) {
     exit 1;
 }
 
-sub testcommand {
-    my ($cmd) = @_;
-
-    my $fullcmd = `which $cmd`;
-    chomp $fullcmd;
-    return $fullcmd && -x $fullcmd;
-}
-
 sub mustsetvar {
     my ($var, $text) = @_;