dpkg-buildpackage: check version validity early

error out early if the version number from the changelog
is not a valid Debian version.

diff --git a/ChangeLog b/ChangeLog
index 6fa71cc0208333afe8b4b2c89cfe2c35cc2487ae..b1eafabe1f725c27e523878f7aceafe0b770162a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-09-29  Frank Lichtenheld  <djpig@debian.org>
 
+       * scripts/dpkg-buildpackage.pl: Call checkversion()
+       on version extracted from changelog. Since other
+       program we call later will do the same there is
+       really no reason not to fail early.
+
        * scripts/dpkg-buildpackage.pl (testcommand):
        Make the check more sensible. Instead of testing
        /usr/bin/$cmd, test `which $cmd`.

diff --git a/debian/changelog b/debian/changelog
index c18f59d0be91cf81ef8c8de256863e4844f30941..6c33f1cb144ab00cd67aa6209e5c8f60d94e5f2e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ dpkg (1.14.7) UNRELEASED; urgency=low
   * Add --utf8-strings to gpg call in dpkg-buildpackage since
     that seems to be the better default. Suggested by Székelyi Szabolcs.
     Closes: #379418
+  * Let dpkg-buildpackage error out early if the version number from
+    the changelog is not a valid Debian version. Closes: #216075
 
   [ Updated dpkg translations ]
   * Basque (Piarres Beobide). Closes: #440859

diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 1387cab8ee6c653f0b9a64bb7a077638817a94fb..f34a8c6eec09b809672ed571b8fd9a4a41c6c2e4 100644 (file)
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -260,6 +260,7 @@ sub mustsetvar {
 
 my $pkg = mustsetvar($changes{source}, _g('source package'));
 my $version = mustsetvar($changes{version}, _g('source version'));
+checkversion($version);
 
 my $maintainer;
 if ($changedby) {