The following commit has been merged in the master branch:
commit c4a75309f62d9dcd78f810500a8db3e576fdaa38
Author: Guillem Jover <[email protected]>
Date: Mon Oct 29 17:44:06 2012 +0100
dpkg-vendor: Use Dpkg::Vendor::get_vendor_dir instead of literal string
Print the correct path to the vendor directory, overridable either at
configure or run-time.
diff --git a/debian/changelog b/debian/changelog
index 7af823d..90aedc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -85,6 +85,7 @@ dpkg (1.17.0) UNRELEASED; urgency=low
* Fix Dpkg::Control::Hash set_options() to take a hash as argument instead
of two scalars.
* Add a new Dpkg::Vendor get_vendor_dir() function.
+ * Print correct path to vendor directory on error message in dpkg-vendor.
[ Updated manpages translations ]
* Fix incorrect translation of "fortify" in French manpage for
dpkg-buildflags
diff --git a/scripts/dpkg-vendor.pl b/scripts/dpkg-vendor.pl
index 469a220..6eaf4dd 100755
--- a/scripts/dpkg-vendor.pl
+++ b/scripts/dpkg-vendor.pl
@@ -24,7 +24,7 @@ use warnings;
use Dpkg;
use Dpkg::Gettext;
use Dpkg::ErrorHandling;
-use Dpkg::Vendor qw(get_vendor_info get_current_vendor);
+use Dpkg::Vendor qw(get_vendor_dir get_vendor_info get_current_vendor);
textdomain('dpkg-dev');
@@ -84,8 +84,8 @@ $vendor //= get_current_vendor();
my $info = get_vendor_info($vendor);
unless (defined($info)) {
- error(_g("vendor %s doesn't exist in /etc/dpkg/origins/"),
- $vendor || 'default');
+ error(_g("vendor %s doesn't exist in %s"), $vendor || 'default',
+ get_vendor_dir());
}
if ($action eq 'is') {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
