The following commit has been merged in the master branch:
commit 31f21da594fb6ecda7c3f01a71c5f93c0eb0241a
Author: James Vega <[email protected]>
Date: Fri Feb 18 22:29:58 2011 -0500
build-rdeps: Remove hard-coded path for grep-dctrl.
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index f4e64cd..ef7edcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ devscripts (2.10.71) UNRELEASED; urgency=low
* dget: Ignore IO::File errors from local cache when a URL is given.
The local cache should be used when accessible, but not prevent downloads
when it isn't. (Closes: #599354)
+ * build-rdeps: Remove hard-coded path for grep-dctrl.
[ Patrick Schoenfeld ]
* build-rdeps: Update release_pattern for the new InRelease release files,
diff --git a/scripts/build-rdeps.pl b/scripts/build-rdeps.pl
index b8240c4..ed6dec6 100755
--- a/scripts/build-rdeps.pl
+++ b/scripts/build-rdeps.pl
@@ -97,7 +97,7 @@ use Pod::Usage;
use Data::Dumper;
my $progname = basename($0);
my $version = '1.0';
-my $dctrl = "/usr/bin/grep-dctrl";
+my $dctrl = "grep-dctrl";
my $sources_path = "/var/lib/apt/lists/";
my $release_pattern = '(.*_dists_(sid|unstable))_(?:In)*Release$';
my %seen_origins;
@@ -111,7 +111,7 @@ my $opt_distribution;
my $opt_origin = 'Debian';
my @opt_exclude_components;
-if (!(-x $dctrl)) {
+if (system('command -v grep-dctrl >/dev/null 2>&1')) {
die "$progname: Fatal error. grep-dctrl is not available.\nPlease
install the 'dctrl-tools' package.\n";
}
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
