The following commit has been merged in the master branch:
commit 1713b7f06e7cd8bfed65c1188f66be222e2e606a
Author: James Vega <[email protected]>
Date: Mon Aug 2 00:30:34 2010 -0400
build-rdeps: Escape regular expression metacharacters in package names.
Closes: #590832
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 621caf3..bd78b03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ devscripts (2.10.66) UNRELEASED; urgency=low
DEBCHANGE_MULTIMAINT_MERGE configuration variable. (Closes: #590842)
* licensecheck: Add .pas, .inc, .dtd., .xsl, and .mod files to the default
check list. (Closes: #534988, #591305)
+ * build-rdeps: Escape regular expression metacharacters in package names.
+ (Closes: #590832)
[ Cyril Brulebois ]
* uscan: Get rid of extra quoting in dpkg --compare-versions calls.
diff --git a/scripts/build-rdeps.pl b/scripts/build-rdeps.pl
index b68ca22..bdff6dc 100755
--- a/scripts/build-rdeps.pl
+++ b/scripts/build-rdeps.pl
@@ -230,17 +230,15 @@ sub findreversebuilddeps {
$depending_package = $1;
$packages{$depending_package}->{'Build-Depends'} = 0;
}
-
- if (/Maintainer: (.*)$/) {
+ elsif (/Maintainer: (.*)$/) {
if ($depending_package) {
$packages{$depending_package}->{'Maintainer'} =
$1;
}
}
-
- if (/Build-Depends: (.*)$/ or /Build-Depends-Indep: (.*)$/) {
+ elsif (/Build-Depends: (.*)$/ or /Build-Depends-Indep: (.*)$/) {
if ($depending_package) {
print STDERR "$1\n" if ($opt_debug);
- if ($1 =~ /^(.*\s)?$package([\s,]|$)/) {
+ if ($1 =~ /^(.*\s)?\Q$package\E([\s,]|$)/) {
$packages{$depending_package}->{'Build-Depends'} = 1;
}
}
@@ -314,7 +312,7 @@ if ($opt_distribution) {
# Find sources files
find(sub { readrelease($_, $1) if /$release_pattern/ }, $sources_path);
-if (($#source_files+1) <= 0) {
+if (!...@source_files) {
die "$progname: unable to find sources files.\nDid you forget to run
apt-get update (or add --update to this command)?";
}
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
