summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xscripts/dpkg-vendor.pl2
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 4da1d1453..afc2283c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ dpkg (1.16.1) UNRELEASED; urgency=low
* Add the extraction part of Dpkg::Source::Package to the supported API.
Useful to extract source packages without having to depend on dpkg-source
(and hence dpkg-dev).
+ * Check presence of required parameters in dpkg-vendor. Closes: #628726
+ Thanks to Niels Thykier <niels@thykier.net> for the patch.
[ Guillem Jover ]
* Install deb-src-control(5) man pages in dpkg-dev. Closes: #620520
diff --git a/scripts/dpkg-vendor.pl b/scripts/dpkg-vendor.pl
index f59f4c633..f1dabe358 100755
--- a/scripts/dpkg-vendor.pl
+++ b/scripts/dpkg-vendor.pl
@@ -61,11 +61,13 @@ while (@ARGV) {
$_ = shift(@ARGV);
if (m/^--vendor$/) {
$vendor = shift(@ARGV);
+ usageerr(_g("%s needs a parameter"), $_) unless defined $vendor;
} elsif (m/^--(is|derives-from|query)$/) {
usageerr(_g("two commands specified: --%s and --%s"), $1, $action)
if defined($action);
$action = $1;
$param = shift(@ARGV);
+ usageerr(_g("%s needs a parameter"), $_) unless defined $param;
} elsif (m/^-(h|-help)$/) {
usage();
exit 0;