infra: Pass distro to dgit-repos-server

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index c70bc27fd13b8a7d50ea3d25dba2bd9a7588f3ef..a2916d6221ceaff7ffa13d07c4c4794ff3fee339 100755 (executable)
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -2,7 +2,7 @@
 # dgit-repos-server
 #
 # usages:
-#  .../dgit-repos-server SUITES KEYRING-AUTH-SPEC DGIT-REPOS-DIR --ssh
+#  .../dgit-repos-server DISTRO SUITES KEYRING-AUTH-SPEC DGIT-REPOS-DIR --ssh
 # internal usage:
 #  .../dgit-repos-server --pre-receive-hook PACKAGE
 #
@@ -549,6 +549,7 @@ sub parseargsdispatch () {
        shift @ARGV;
        @ARGV == 1 or die;
        $package = shift @ARGV;
+       defined($distro = $ENV{'DGIT_DRS_DISTRO'}) or die;
        defined($suitesfile = $ENV{'DGIT_DRS_SUITES'}) or die;
        defined($workrepo = $ENV{'DGIT_DRS_WORK'}) or die;
        defined($destrepo = $ENV{'DGIT_DRS_DEST'}) or die;
@@ -564,6 +565,7 @@ sub parseargsdispatch () {
        exit 0;
     }
 
+    $ENV{'DGIT_DRS_DISTRO'} = argval();
     $ENV{'DGIT_DRS_SUITES'} = argval();
     $ENV{'DGIT_DRS_KEYRINGS'} = argval();
     $dgitrepos = argval();

diff --git a/infra/dgit-ssh-dispatch b/infra/dgit-ssh-dispatch
index b515edad988391635275fd4c54c7400a2eb7e9aa..88311ee37bf6cac0df28c0ab8a3fb1bdd424d2ca 100755 (executable)
--- a/infra/dgit-ssh-dispatch
+++ b/infra/dgit-ssh-dispatch
@@ -121,7 +121,7 @@ sub dispatch () {
        selectpackage $2,$3;
        if ($cmd eq 'receive-pack') {
            my $s = "$dgitlive/infra/dgit-repos-server";
-           exec $s, $suites, $authrune, $repos, qw(--ssh);
+           exec $s, $distro, $suites, $authrune, $repos, qw(--ssh);
            die "exec $s: $!";
        } elsif ($cmd eq 'upload-pack') {
            $repo='$repos/_empty' unless hasrepo;