summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Hertzog <hertzog@debian.org>2010-02-21 02:04:13 +0100
committerRaphaël Hertzog <hertzog@debian.org>2010-02-21 02:04:13 +0100
commit51741049b5d8df648e6a08f663bf87c4b5f00529 (patch)
tree922f2565ca51514d0fed855adc27e1311cd07489
parent063f0565dcdf069b7f9624c237ed7fce10571887 (diff)
downloaddpkg-51741049b5d8df648e6a08f663bf87c4b5f00529.tar.gz
dpkg-gencontrol: no longer warns if a substvar provided by -V is not used
The warning is meant to catch unused substitutions coming from the file and the file is package specific with debhelper.
-rw-r--r--debian/changelog3
-rwxr-xr-xscripts/dpkg-gencontrol.pl1
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c76faa0b6..02f05290e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,9 @@ dpkg (1.15.6) UNRELEASED; urgency=low
compared. Closes: #570008
* dpkg-gencontrol does no longer accept arch-specific dependencies in
arch: all packages. Closes: #560071
+ * dpkg-gencontrol no longer warns if a substitution variable provided by -V
+ is not used (the warning is meant to catch unused substitutions coming
+ from the file, those are package specific with debhelper). Closes: #557133
[ Guillem Jover ]
* Handle argument parsing in dpkg-checkbuilddeps and dpkg-scanpackages
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 3d15da2f2..9e30d90bd 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -117,6 +117,7 @@ while (@ARGV) {
$remove{$1}= 1;
} elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:]/) {
$substvars->set($1, $');
+ $substvars->no_warn($1);
} elsif (m/^-T/) {
$varlistfile= $';
} elsif (m/^-n/) {