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

dpkg-buildpackage: Make the testcommand more sensible

Instead of testing /usr/bin/$cmd, test `which $cmd`.
Frank Lichtenheld лет назад: 19
Родитель
Сommit
da1ac541d9
2 измененных файлов с 7 добавлено и 1 удалено
  1. 4 0
      ChangeLog
  2. 3 1
      scripts/dpkg-buildpackage.pl

+ 4 - 0
ChangeLog

@@ -1,5 +1,9 @@
 2007-09-29  Frank Lichtenheld  <djpig@debian.org>
 
+	* scripts/dpkg-buildpackage.pl (testcommand):
+	Make the check more sensible. Instead of testing
+	/usr/bin/$cmd, test `which $cmd`.
+
 	* scripts/dpkg-buildpackage.pl (signfile): Call
 	gpg with --utf8-strings since otherwise the key
 	lookup fails with non-ASCII UTF8-encoded names.

+ 3 - 1
scripts/dpkg-buildpackage.pl

@@ -79,7 +79,9 @@ Options:
 sub testcommand {
     my ($cmd) = @_;
 
-    return -x "/usr/bin/$cmd";
+    my $fullcmd = `which $cmd`;
+    chomp $fullcmd;
+    return $fullcmd && -x $fullcmd;
 }
 
 my $rootcommand = '';