use strict;
use POSIX;
+use Debian::Dgit;
+
open DEBUG, '>/dev/null' or die $!;
if (@ARGV && $ARGV[0] eq '-D') {
shift @ARGV;
'@/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
+# 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 ($dgitlive,$repos,$suites,$diverts,$repo);
+our ($distro,$pkg, $d);
+our ($dgitlive,$repos,$suites,$diverts,$policyhook,$repo);
sub checkdivert ($) {
my ($df) = @_;
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;
$dgitlive= "$d/dgit-live";
$repos= "$d/repos";
$suites= "$d/suites";
+ $policyhook= "$d/policy-hook";
$authrune =~ s/\@/$d/g;
}
}
+sub serve_up ($) {
+ my ($repo) = @_;
+ exec qw(git upload-pack --strict --timeout=1000), $repo;
+ die "exec git: $!";
+}
+
sub dispatch () {
local ($_) = $ENV{'SSH_ORIGINAL_COMMAND'};
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, 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 ($_)";
}