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 ($) {
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;
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;