From: Raphael Hertzog <hertzog@debian.org>
Date: Mon, 5 May 2008 12:14:17 +0000 (+0200)
Subject: dpkg-gensymbols: fail when empty values are given to -v, -P or -e.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b735b963d2a0e84f982c644948f1cea69ca3586;p=dpkg

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 5e89a6ff..52fb4873 100644
--- 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 426dbd18..77542e68 100644
--- 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 df50dad7..f30e397b 100755
--- 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$/) {