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 2be936b87c6a6d3dd23e4acc7664ef2e7dfd2bca..3fe0309304feb8b8d8dd8d47b311b4c4fd0318ec 100644 (file)
--- 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 8162fa109cab65e8c66fe2afb8be89ee7b5d7c35..6d7fb6316ca4e3f4fe464e679a77ff03970aa389 100755 (executable)
--- 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 ed1e6ef9924e4f421d353388d97b552fbcd0cff5..4769d895830f5aa154e49fc0cc94f069a9e68bb4 100755 (executable)
--- 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