[SCM] Git repository for devscripts branch, master, updated. v2.11.7-23-gc4dd0ae

[Benjamin Drung]

The following commit has been merged in the master branch:
commit c4dd0ae7ad924768cef992d15fe73b29fc6d1229
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon May 28 20:19:41 2012 +0200

    debchange: Always perform Vendor check.

diff --git a/debian/changelog b/debian/changelog
index 7bf30da..c639274 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ devscripts (2.11.8) UNRELEASED; urgency=low
   * debchange:
     + Add --vendor= and DEBCHANGE_VENDOR to override the distributor ID
       returned by dpkg-vendor.
+    + Always perform Vendor check.
 
   [ Stefano Rivera ]
   * devscripts.Logger Don't substitute arguments into logged strings unless
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 126297f..70d82f8 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -403,18 +403,18 @@ if (defined $opt_u) {
 	unless $opt_u =~ /^(low|medium|high|critical|emergency)$/;
 }
 
+# See if we're Debian, Ubuntu or someone else, if we can
+my $distributor;
+if (not $opt_vendor eq '') {
+    $distributor = $opt_vendor;
+} elsif (system('command -v dpkg-vendor >/dev/null 2>&1') >> 8 == 0) {
+    $distributor = `dpkg-vendor --query Vendor 2>/dev/null`;
+    chomp $distributor;
+}
+$distributor ||= 'Debian';
+
 # Check the distro name given.
 if (defined $opt_D) {
-    # See if we're Debian, Ubuntu or someone else, if we can
-    my $distributor;
-    if (not $opt_vendor eq '') {
-	$distributor = $opt_vendor;
-    } elsif (system('command -v dpkg-vendor >/dev/null 2>&1') >> 8 == 0) {
-	$distributor = `dpkg-vendor --query Vendor 2>/dev/null`;
-	chomp $distributor;
-    }
-    $distributor ||= 'Debian';
-
     if ($distributor eq 'Debian') {
 	unless ($opt_D =~ /^(unstable|((old)?stable|testing)(-security)?|experimental|UNRELEASED|squeeze-backports|((oldstable|testing)-)?proposed-updates)$/) {
 	    warn "$progname warning: Recognised distributions are: unstable, testing, stable,\noldstable, experimental, UNRELEASED, squeeze-backports,\n{oldstable-,testing-,}proposed-updates and {testing,stable,oldstable}-security.\nUsing your request anyway.\n";

-- 
Git repository for devscripts