X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-ssh-dispatch;h=9c023d80859fecd63cbc6ca64dfc925818bfc473;hp=ed1e6ef9924e4f421d353388d97b552fbcd0cff5;hb=5a453a69bd237e3921a6db60f675bdaefb741014;hpb=772fdc0dc3733838b2efdf0c9af7252c2eafafd8

diff --git a/infra/dgit-ssh-dispatch b/infra/dgit-ssh-dispatch
index ed1e6ef9..9c023d80 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,22 +18,23 @@ $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
-#    dgit-live   a clone of dgit
-#    repos/
-#    suites
+# $dispatchdir/distro=DISTRO should contain
+#    dgit-live          a clone of dgit (only if not using installed vsns)
 #    diverts
-#    policy-hook
+#    repos/             }  by virtue of
+#    suites             }    dgit-repos-server's defaults relating to
+#    policy-hook        }    dispatch-dir
 # plus files required by the authrune (by default, keyrings/ and dm.txt)
 #
 # diverts should be list of
 #  <pat> [<divert-to>]
 # where <pat> is a package name pattern which may contain * or literals.
+# <divert-to> is for `git config dgit-distro.DISTRO.diverts.<divert-to>'
 
-our ($distro,$pkg);
+our ($distro,$pkg, $d);
 our ($dgitlive,$repos,$suites,$diverts,$policyhook,$repo);
 
 sub checkdivert ($) {
@@ -71,7 +74,7 @@ sub selectpackage ($$;$) {
     my $divertfn;
     ($distro,$pkg, $divertfn) = @_; # $distro,$pkg must have sane syntax
 
-    my $d = "$dispatchdir/distro=$distro";
+    $d = "$dispatchdir/distro=$distro";
 
     if (!stat $d) {
 	die $! unless $!==ENOENT;
@@ -109,30 +112,48 @@ sub hasrepo () {
     }
 }
 
+sub serve_up ($) {
+    my ($repo) = @_;
+    exec qw(git upload-pack --strict --timeout=1000), $repo;
+    die "exec git: $!";
+}
+
 sub dispatch () {
-    local ($_) = $ENV{'SSH_ORIGINAL_COMMAND'};
+    local ($_) = $ENV{'SSH_ORIGINAL_COMMAND'} // '';
 
     if (m#^: dgit ($lre) git-check ($lre) ;#) {
 	selectpackage $1,$2, sub { prl "divert @_"; finish; };
 	prl hasrepo;
 	finish;
     } elsif (
-        m#^${qre}git-([-a-z]+) ${qre}/dgit/($lre)/repos/($lre)\.git${qre}$#
-    ) {
+	m#^${qre}git-([-a-z]+) ${qre}/dgit/($lre)/repos/($lre)\.git${qre}$#
+	) {
 	my $cmd=$1;
 	selectpackage $2,$3;
 	if ($cmd eq 'receive-pack') {
+	    $ENV{'PERLLIB'} //= '';
+	    $ENV{'PERLLIB'} =~ s#^(?=.)#:#;
+	    $ENV{'PERLLIB'} =~ s#^# $ENV{DGIT_TEST_INTREE} // $dgitlive #e;
 	    my $s = "$dgitlive/infra/dgit-repos-server";
-	    exec $s, $distro, $suites, $authrune, $repos,
-	            $policyhook, qw(--ssh);
+	    $s = "dgit-repos-server" if !stat_exists $s;
+	    exec $s, $distro, $d, $authrune, qw(--ssh);
 	    die "exec $s: $!";
 	} elsif ($cmd eq 'upload-pack') {
 	    $repo='$repos/_empty' unless hasrepo;
-	    exec qw(git upload-pack --strict --timeout=1000), $repo;
-	    die "exec git: $!";
+	    serve_up $repo;
 	} else {
 	    die "unsupported git operation $cmd ($_)";
 	}
+    } elsif (
+ m#^${qre}git-upload-pack ${qre}/dgit/($lre)/(?:repos/)?_dgit-repos-server\.git${qre}$#
+	) {
+	my $distro= $1;
+	# if running installed packages, source code should come
+	# some other way
+	serve_up("$dispatchdir/distro=$1/dgit-live/.git");
+    } elsif (m#^${qre}git-upload-pack\s#) {
+	die "unknown repo to serve ($_).  use dgit, or for server source ".
+	    "git clone here:/dgit/DISTRO/repos/_dgit-repos-server.git";
     } else {
 	die "unsupported operation ($_)";
     }