Dgit.pm: Introduce $deliberately_re and use it everywhere

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 5953490e41bb919db1eb8ab1405d75e2094bb784..3f2988e4b3599f08b4b9e54fa5b2170c53d96723 100644 (file)
--- 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
     @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
                       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 $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
 our $branchprefix = 'dgit';
 
 # policy hook exit status bits

diff --git a/dgit b/dgit
index 8db03b3f5ee8737b55a50b1c8c585c66c0ea1ec0..e80faf3ec8f7f56a90582950ad43565945b621b6 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2784,7 +2784,7 @@ sub parseopts () {
            } elsif (m/^--no-rm-on-error$/s) {
                push @ropts, $_;
                $rmonerror = 0;
            } 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 {
                push @ropts, $_;
                push @deliberatelies, $&;
            } else {

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 036469e94d5427ecc0eff15f244016e6832d7ab6..26164067dbc47b77389b0ded4b61980761226418 100755 (executable)
--- 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;
            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};
                    push @deliberatelies, $1;
                } elsif (s/^supersede:(\S+)=(\w+) //) {
                    die "supersede $1 twice" if defined $supersedes{$1};