X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-repos-server;h=2cc650d03f61dca4f8633401bd3eb77929103898;hp=3a471a1d741718f9cff003d38f5bc2b560af97cb;hb=ccc64aa5e65a4093c03d6313d86abd879033b0ec;hpb=4d5f90bf99d9f50ebf2012b5aba4ebe7b114125c

diff --git a/dgit-repos-server b/dgit-repos-server
index 3a471a1d..2cc650d0 100755
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -155,13 +155,17 @@ sub reject ($) {
     die "dgit-repos-server: reject: $why\n";
 }
 
-sub runcmd {
+sub debugcmd {
     if ($debug) {
 	use Data::Dumper;
 	local $Data::Dumper::Indent = 0;
 	local $Data::Dumper::Terse = 1;
 	debug "|".Dumper(\@_);
     }
+}
+
+sub runcmd {
+    debugcmd @_;
     $!=0; $?=0;
     my $r = system @_;
     die "@_ $? $!" if $r;
@@ -173,7 +177,9 @@ sub fixmissing__git_receive_pack () {
     mkrepotmp();
     $destrepo = "$dgitrepos/_tmp/${package}_prospective";
     acquiretree($destrepo, 1);
-    my $r = system qw(cp -a --), "$dgitrepos/_template", "$destrepo";
+    my $template = "$dgitrepos/_template";
+    debug "fixmissing copy tempalate $template -> $destrepo";
+    my $r = system qw(cp -a --), $template, $destrepo;
     !$r or die "create new repo failed failed: $r $!";
 }
 
@@ -202,7 +208,7 @@ END
 sub maybeinstallprospective () {
     return if $destrepo eq $realdestrepo;
 
-    debug " show-ref ...";
+    debug " show-ref ($destrepo) ...";
 
     my $child = open SR, "-|";
     defined $child or die $!;
@@ -222,9 +228,11 @@ sub maybeinstallprospective () {
 	    die;
 	die if $got{$wh}++;
     }
+    debug "installprospective ?";
     die if grep { !$_ } values %got;
     $!=0; $?=0; close SR or die "$? $!";
 
+    debug "install $destrepo => $realdestrepo";
     rename $destrepo, $realdestrepo or die $!;
     remove "$destrepo.lock" or die $!;
 }
@@ -232,7 +240,7 @@ sub maybeinstallprospective () {
 sub main__git_receive_pack () {
     makeworkingclone();
     setupstunthook();
-    runcmd qw(git receive-pack), $destrepo;
+    runcmd qw(git receive-pack), $workrepo;
     maybeinstallprospective();
 }
 
@@ -245,7 +253,7 @@ sub readupdates () {
     debug " updates ...";
     while (<STDIN>) {
 	chomp or die;
-	debug " updates| $_";
+	debug " upd.| $_";
 	m/^(\S+) (\S+) (\S+)$/ or die "$_ ?";
 	my ($old, $sha1, $refname) = ($1, $2, $3);
 	if ($refname =~ m{^refs/tags/(?=debian/)}) {
@@ -288,11 +296,12 @@ sub parsetag () {
 	}
     }
     $!=0; $_=<T>; defined or die $!;
-    m/^($package_re) release (\S+) for (\S+) \[dgit\]$/ or die;
+    m/^($package_re) release (\S+) for (\S+) \[dgit\]$/ or
+	reject "tag message not in expected format";
 
     die unless $1 eq $package;
     $version = $2;
-    die unless $3 eq $suite;
+    die "$3 != $suite " unless $3 eq $suite;
 
     for (;;) {
 	print PT or die $!;
@@ -437,16 +446,18 @@ sub checks () {
 }
 
 sub onwardpush () {
+    my @cmd = (qw(git send-pack), $destrepo,
+	       "$commit:refs/dgit/$suite",
+	       "$tagval:refs/tags/$tagname");
+    debugcmd @cmd;
     $!=0;
-    my $r = system (qw(git send-pack),
-		    $destrepo,
-		    "$commit:refs/dgit/$suite",
-		    "$tagval:refs/tags/$tagname");
+    my $r = system @cmd;
     !$r or die "onward push failed: $r $!";
 }	
 
 sub stunthook () {
     debug "stunthook";
+    print Dumper(\$ENV{GIT_DIR});
     chdir $workrepo or die "chdir $workrepo: $!";
     mkdir "dgit-tmp" or $!==EEXIST or die $!;
     readupdates();
@@ -454,6 +465,7 @@ sub stunthook () {
     verifytag();
     checks();
     onwardpush();
+    debug "stunthook done.";
 }
 
 #----- git-upload-pack -----