[devscripts] 01/01: debchange: Make Tanglu rebuild-version handling more strict

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to branch master
in repository devscripts.

commit 25b69a6aeb878a24b932db459a95b69369bceba2
Author: Matthias Klumpp <matthias at tenstral.net>
Date:   Wed Feb 5 01:37:40 2014 +0100

    debchange: Make Tanglu rebuild-version handling more strict
    
    This fixes several issues where the letter b appears in upstream
    versions, and bX is not correctly replaced.
---
 scripts/debchange.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index d5458d2..85f933a 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -1185,7 +1185,7 @@ if (($opt_i || $opt_n || $opt_bn || $opt_qa || $opt_R || $opt_s || $opt_team ||
 	             not $start =~ /build/ and not $start =~ /ubuntu/) {
 		$end .= "build1";
 	    } elsif ($opt_R and $vendor eq 'Tanglu' and
-	             not $start =~ /b/ and not $start =~ /tanglu/) {
+	             not "$start$end" =~ /(b\d+)$/ and not $start =~ /tanglu/) {
 		$end .= "b1";
 	    } elsif ($opt_bpo and not $start =~ /~bpo[0-9]+\+$/) {
 		# If it's not already a backport make it so
@@ -1210,10 +1210,10 @@ if (($opt_i || $opt_n || $opt_bn || $opt_qa || $opt_R || $opt_s || $opt_team ||
 		} elsif (($opt_i or $opt_s) and $vendor eq 'Tanglu' and
 		     $start !~ /(tanglu)(\d+\.)*$/ and not $opt_U) {
 
-		    if ($start =~ /b/) {
-			# Drop bX suffix in favor of tanglu1
-			$start =~ s/b//;
-			$end = "";
+		    if ("$start$end" =~ /(b\d+)$/) {
+				# Drop bX suffix in favor of tanglu1
+				$start =~ s/b$//;
+				$end = "";
 		    }
 		    $end .= "tanglu1";
 		} else {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git