chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit-repos-policy-debian: Fix add_taint
[dgit.git]
/
infra
/
dgit-ssh-dispatch
diff --git
a/infra/dgit-ssh-dispatch
b/infra/dgit-ssh-dispatch
index 4769d895830f5aa154e49fc0cc94f069a9e68bb4..f29515f53e073c8b19e7345f950a278dad58e896 100755
(executable)
--- a/
infra/dgit-ssh-dispatch
+++ b/
infra/dgit-ssh-dispatch
@@
-21,19
+21,19
@@
$authrune //= join ':',
our $lre = $package_re;
our $qre = '["'."']?";
our $lre = $package_re;
our $qre = '["'."']?";
-# $dispatchdir should contain
+# $dispatchdir
/distro=DISTRO
should contain
# dgit-live a clone of dgit
# dgit-live a clone of dgit
-# repos/
-# suites
# diverts
# 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.
# 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 ($) {
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 $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;
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";
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;
die "exec $s: $!";
} elsif ($cmd eq 'upload-pack') {
$repo='$repos/_empty' unless hasrepo;