[SCM] Git repository for devscripts branch, master, updated. v2.11.7-69-g8429b1b

[Benjamin Drung]

The following commit has been merged in the master branch:
commit 8429b1b199abe40fef4508a01d7a9d1921d62d39
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sun Jun 17 19:56:37 2012 +0200

    debchange: Use the Dpkg::Vendor Perl API directly to avoid the overhead of the command line dpkg-vendor script.

diff --git a/debian/changelog b/debian/changelog
index 31b7937..f73264a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,10 @@ devscripts (2.11.9) UNRELEASED; urgency=low
       to chrysn for the patch.  (Closes: #675337)
     + Do not install Recommends by default.  (Closes: #575245)
 
+  [ Benjamin Drung ]
+  * debchange: Use the Dpkg::Vendor Perl API directly to avoid the overhead
+    of the command line dpkg-vendor script.
+
  -- David Prévot <taffit at debian.org>  Thu, 31 May 2012 12:12:02 -0400
 
 devscripts (2.11.8) unstable; urgency=low
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 2c6205e..6ede84c 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -40,6 +40,7 @@ use File::Copy;
 use File::Basename;
 use Cwd;
 use Dpkg::Compression;
+use Dpkg::Vendor qw(get_current_vendor);
 use lib '/usr/share/devscripts';
 use Devscripts::Debbugs;
 
@@ -459,9 +460,9 @@ if (not $opt_vendor eq '') {
 	    $vendor = 'Ubuntu';
 	}
     }
-    if (not defined $vendor and system('command -v dpkg-vendor >/dev/null 2>&1') >> 8 == 0) {
-	$vendor = `dpkg-vendor --query Vendor 2>/dev/null`;
-	chomp $vendor;
+    if (not defined $vendor) {
+	# Get the vendor from dpkg-vendor (dpkg-vendor --query Vendor)
+	$vendor = get_current_vendor();
     }
 }
 $vendor ||= 'Debian';

-- 
Git repository for devscripts