From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 May 2015 13:11:43 +0000 (+0100)
Subject: Dgit.pm: Introduce $deliberately_re and use it everywhere
X-Git-Tag: debian/0.30~152
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=7684f83e49bdc4d883e682abd922a7722cf996c4

Dgit.pm: Introduce $deliberately_re and use it everywhere
---

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 5953490e..3f2988e4 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -17,7 +17,8 @@ BEGIN {
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists git_for_each_ref
                       git_for_each_tag_referring
-                      $package_re $component_re $branchprefix
+                      $package_re $component_re $deliberately_re
+                      $branchprefix
                       initdebug enabledebug enabledebuglevel
                       printdebug debugcmd
                       $debugprefix *debuglevel *DEBUG
@@ -30,6 +31,7 @@ our @EXPORT_OK;
 
 our $package_re = '[0-9a-z][-+.0-9a-z]*';
 our $component_re = '[0-9a-zA-Z][-+.0-9a-zA-Z]*';
+our $deliberately_re = "(?:TEST-)?$package_re";
 our $branchprefix = 'dgit';
 
 # policy hook exit status bits
diff --git a/dgit b/dgit
index 8db03b3f..e80faf3e 100755
--- a/dgit
+++ b/dgit
@@ -2784,7 +2784,7 @@ sub parseopts () {
 	    } elsif (m/^--no-rm-on-error$/s) {
 		push @ropts, $_;
 		$rmonerror = 0;
-	    } elsif (m/^--deliberately-($suite_re)$/s) {
+	    } elsif (m/^--deliberately-($deliberately_re)$/s) {
 		push @ropts, $_;
 		push @deliberatelies, $&;
 	    } else {
diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 036469e9..26164067 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -499,7 +499,7 @@ sub parsetag () {
 	    while (length) {
 		if (s/^distro\=(\S+) //) {
 		    die "$1 != $distro" unless $1 eq $distro;
-		} elsif (s/^(--deliberately-$package_re) //) {
+		} elsif (s/^(--deliberately-$deliberately_re) //) {
 		    push @deliberatelies, $1;
 		} elsif (s/^supersede:(\S+)=(\w+) //) {
 		    die "supersede $1 twice" if defined $supersedes{$1};