From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 21 Mar 2015 10:48:37 +0000 (+0000)
Subject: Move $package_re into Debian::Dgit
X-Git-Tag: debian/0.30~262
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=850c5e51043c2eb3a9804877314edefb6156e816

Move $package_re into Debian::Dgit

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

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 2be936b8..3fe03093 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -11,13 +11,16 @@ BEGIN {
 
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
-    @EXPORT      = qw(debiantag);
+    @EXPORT      = qw(debiantag
+                      $package_re);
     %EXPORT_TAGS = ( );     # eg: TAG => [ qw!name1 name2! ],
     @EXPORT_OK   = qw();
 }
 
 our @EXPORT_OK;
 
+our $package_re = '[0-9a-z][-+.0-9a-z]*';
+
 sub debiantag ($) { 
     my ($v) = @_;
     $v =~ y/~:/_%/;
diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 8162fa10..6d7fb631 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -87,9 +87,9 @@ use POSIX;
 use Fcntl qw(:flock);
 use File::Path qw(rmtree);
 
-open DEBUG, ">/dev/null" or die $!;
+use Debian::Dgit;
 
-our $package_re = '[0-9a-z][-+.0-9a-z]+';
+open DEBUG, ">/dev/null" or die $!;
 
 our $func;
 our $dgitrepos;
diff --git a/infra/dgit-ssh-dispatch b/infra/dgit-ssh-dispatch
index ed1e6ef9..4769d895 100755
--- a/infra/dgit-ssh-dispatch
+++ b/infra/dgit-ssh-dispatch
@@ -3,6 +3,8 @@
 use strict;
 use POSIX;
 
+use Debian::Dgit;
+
 open DEBUG, '>/dev/null' or die $!;
 if (@ARGV && $ARGV[0] eq '-D') {
     shift @ARGV;
@@ -16,7 +18,7 @@ $authrune //= join ':',
     '@/keyrings/debian-keyring.gpg,a',
     '@/keyrings/debian-maintainers.gpg,m@/dm.txt';
 
-our $lre = '[0-9a-z][-+.0-9a-z]*';
+our $lre = $package_re;
 our $qre = '["'."']?";
 
 # $dispatchdir should contain