From 10ac2ae8f0d807790ac337b5424a53e8d5e239c2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 23 Apr 2015 15:03:29 +0100
Subject: dgit-repos-server etc.: Rework argument & distros-dir passing (no
 overall functional change)

---
 infra/dgit-ssh-dispatch | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'infra/dgit-ssh-dispatch')

diff --git a/infra/dgit-ssh-dispatch b/infra/dgit-ssh-dispatch
index 4769d89..f29515f 100755
--- a/infra/dgit-ssh-dispatch
+++ b/infra/dgit-ssh-dispatch
@@ -21,19 +21,19 @@ $authrune //= join ':',
 our $lre = $package_re;
 our $qre = '["'."']?";
 
-# $dispatchdir should contain
+# $dispatchdir/distro=DISTRO should contain
 #    dgit-live   a clone of dgit
-#    repos/
-#    suites
 #    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.
 
-our ($distro,$pkg);
+our ($distro,$pkg, $d);
 our ($dgitlive,$repos,$suites,$diverts,$policyhook,$repo);
 
 sub checkdivert ($) {
@@ -73,7 +73,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;
@@ -125,8 +125,7 @@ sub dispatch () {
 	selectpackage $2,$3;
 	if ($cmd eq 'receive-pack') {
 	    my $s = "$dgitlive/infra/dgit-repos-server";
-	    exec $s, $distro, $suites, $authrune, $repos,
-	            $policyhook, qw(--ssh);
+	    exec $s, $distro, $d, $authrune, qw(--ssh);
 	    die "exec $s: $!";
 	} elsif ($cmd eq 'upload-pack') {
 	    $repo='$repos/_empty' unless hasrepo;
-- 
cgit v1.2.3