dpkg-gensymbols: fail when empty values are given to -v, -P or -e.

* scripts/dpkg-gensymbols.pl: Do not accept empty parameters for
-v, -P and -e. "-v" led to empty versions in symbols files and people used
that option by mistake believing it would enable a verbose mode.

diff --git a/ChangeLog b/ChangeLog
index 5e89a6ff3b3488a050e357caab7d9bf8ea2c583d..52fb48735450d4fd78a5981dc2b873b5e9364594 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-05  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/dpkg-gensymbols.pl: Do not accept empty parameters for
+       -v,  -P and -e.
+
 2008-05-05  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/dpkg-shlibdeps.pl: Include the format of the desired

diff --git a/debian/changelog b/debian/changelog
index 426dbd1884511a8fd96ebe34ef88c98b970e1724..77542e6832113feddfa7d2047ff9eff86cb12241 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low
   [ Raphael Hertzog ]
   * Enhance dpkg-shlibdeps's error message when a library can't be found to
     include the ELF format of the desired library. Closes: #474671
+  * dpkg-gensymbols now refuses empty values for the the -v -P and -e
+    parameters.
 
   [ Updated dpkg translations ]
   * Portuguese (Miguel Figueiredo).

diff --git a/scripts/dpkg-gensymbols.pl b/scripts/dpkg-gensymbols.pl
index df50dad74401b89ba326459eac403694ff725e9e..f30e397be73eda3796ee7c4689f692522e497515 100755 (executable)
--- a/scripts/dpkg-gensymbols.pl
+++ b/scripts/dpkg-gensymbols.pl
@@ -74,9 +74,9 @@ while (@ARGV) {
        $compare = defined($1) ? $1 : 1;
     } elsif (m/^-d$/) {
        $debug = 1;
-    } elsif (m/^-v(.*)/) {
+    } elsif (m/^-v(.+)$/) {
        $sourceversion = $1;
-    } elsif (m/^-e(.*)/) {
+    } elsif (m/^-e(.+)$/) {
        my $file = $1;
        if (-e $file) {
            push @files, $file;
@@ -85,7 +85,7 @@ while (@ARGV) {
        }
     } elsif (m/^-p(.*)/) {
        error(_g("Illegal package name \`%s'"), $1);
-    } elsif (m/^-P(.*)$/) {
+    } elsif (m/^-P(.+)$/) {
        $packagebuilddir = $1;
        $packagebuilddir =~ s{/+$}{};
     } elsif (m/^-O$/) {