Dgit.pm: Move $suite_re from dgit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 887fbb599caa978c5ce3c499487dec73a3cfab20..348f608c5b5f3087d4e49bf44375c139e911d75b 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -64,7 +64,7 @@ BEGIN {
                      read_tree_debian read_tree_upstream
                      make_commit hash_commit hash_commit_text
                      reflog_cache_insert reflog_cache_lookup
                      read_tree_debian read_tree_upstream
                      make_commit hash_commit hash_commit_text
                      reflog_cache_insert reflog_cache_lookup

-                      $package_re $component_re $deliberately_re
+                      $package_re $component_re $suite_re $deliberately_re

                      $distro_re $versiontag_re $series_filename_re
                      $orig_f_comp_re $orig_f_sig_re $orig_f_tail_re
                      $extra_orig_namepart_re
                      $distro_re $versiontag_re $series_filename_re
                      $orig_f_comp_re $orig_f_sig_re $orig_f_tail_re
                      $extra_orig_namepart_re


@@ -96,6 +96,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 $suite_re = '[-+.0-9a-z]+';

 our $deliberately_re = "(?:TEST-)?$package_re";
 our $distro_re = $component_re;
 our $versiontag_re = qr{[-+.\%_0-9a-zA-Z/]+};
 our $deliberately_re = "(?:TEST-)?$package_re";
 our $distro_re = $component_re;
 our $versiontag_re = qr{[-+.\%_0-9a-zA-Z/]+};

diff --git a/dgit b/dgit
index 491cb234447e19df1dfe8248534179ab4cb1fd8b..6febb07aa45ef0e69b0a8283a9b5f0afcbe29565 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -104,7 +104,6 @@ our %forceopts = map { $_=>0 }
 
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
 
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 

-our $suite_re = '[-+.0-9a-z]+';

 our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )?
                      | (?: git | git-ff ) (?: ,always )?
                          | check (?: ,ignores )?
 our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )?
                      | (?: git | git-ff ) (?: ,always )?
                          | check (?: ,ignores )?