Dgit.pm, dgit: Break $extra_orig_namepart_re out into Dgit.pm.

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

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index d086cbe50d36d33e14cea82de5f00b8b367d569a..a4ec3774099192941153e4557b3eb7520a992c71 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -53,6 +53,7 @@ BEGIN {
                       git_for_each_tag_referring is_fast_fwd
                       $package_re $component_re $deliberately_re
                      $distro_re $versiontag_re $series_filename_re
                       git_for_each_tag_referring is_fast_fwd
                       $package_re $component_re $deliberately_re
                      $distro_re $versiontag_re $series_filename_re

+                     $extra_orig_namepart_re

                       $branchprefix
                       initdebug enabledebug enabledebuglevel
                       printdebug debugcmd
                       $branchprefix
                       initdebug enabledebug enabledebuglevel
                       printdebug debugcmd


@@ -80,6 +81,7 @@ our $distro_re = $component_re;
 our $versiontag_re = qr{[-+.\%_0-9a-zA-Z/]+};
 our $branchprefix = 'dgit';
 our $series_filename_re = qr{(?:^|\.)series(?!\n)$}s;
 our $versiontag_re = qr{[-+.\%_0-9a-zA-Z/]+};
 our $branchprefix = 'dgit';
 our $series_filename_re = qr{(?:^|\.)series(?!\n)$}s;

+our $extra_orig_namepart_re = qr{[-0-9a-z]+};

 
 # policy hook exit status bits
 # see dgit-repos-server head comment for documentation
 
 # policy hook exit status bits
 # see dgit-repos-server head comment for documentation

diff --git a/debian/changelog b/debian/changelog
index 8d830f0353d8ea704b007069d009c0569ce92cea..e41345408507813ac30bf8a403251a9adccaa154 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ dgit (4.5~) unstable; urgency=medium
 
   Internal changes:
   * Move $playground global to dgit.
 
   Internal changes:
   * Move $playground global to dgit.

-  * Break git_get_symref out into Dgit.pm.
+  * Break git_get_symref and $extra_orig_namepart_re out into Dgit.pm.

 
  --
 
 
  --
 

diff --git a/dgit b/dgit
index aaafefb736a05d88258e7c5d4f0023c174f37cf3..573f39ad07f7251adbc1fdfa41429e8c7232ac40 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -95,7 +95,7 @@ our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
 our $suite_re = '[-+.0-9a-z]+';
 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
 
 our $suite_re = '[-+.0-9a-z]+';
 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';

-our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
+our $orig_f_comp_re = qr{orig(?:-$extra_orig_namepart_re)?};

 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
 
 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";