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

diff --git a/dgit-repos-server b/dgit-repos-server
index 3a471a1d..6acd6894 100755
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -149,19 +149,35 @@ sub mkrepotmp () {
     die $!;
 }
 
+sub recorderror ($) {
+    my ($why) = @_;
+    my $w = $ENV{'DGIT_DRS_WORK'}; # we are in stunthook
+    if (defined $w) {
+	open ERR, ">", "$w/drs-error" or die $!;
+	print ERR $why, "\n" or die $!;
+	close ERR or die $!;
+	return 1;
+    }
+    return 0;
+}
+
 sub reject ($) {
     my ($why) = @_;
-    debug " rejecting $why";
+    recorderror "reject: $why";
     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 +189,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 +220,17 @@ END
 sub maybeinstallprospective () {
     return if $destrepo eq $realdestrepo;
 
-    debug " show-ref ...";
+    if (open REJ, "<", "$workrepo/drs-error") {
+	local $/ = undef;
+	my $msg = <REJ>;
+	REJ->error and die $!;
+	print STDERR $msg;
+	exit 1;
+    } else {
+	$!==&ENOENT or die $!;
+    }
+
+    debug " show-ref ($destrepo) ...";
 
     my $child = open SR, "-|";
     defined $child or die $!;
@@ -222,9 +250,13 @@ sub maybeinstallprospective () {
 	    die;
 	die if $got{$wh}++;
     }
-    die if grep { !$_ } values %got;
-    $!=0; $?=0; close SR or die "$? $!";
+    $!=0; $?=0; close SR or $?==256 or die "$? $!";
 
+    debug "installprospective ?";
+    die Dumper(\%got)." -- missing refs in new repo"
+	if grep { !$_ } values %got;
+
+    debug "install $destrepo => $realdestrepo";
     rename $destrepo, $realdestrepo or die $!;
     remove "$destrepo.lock" or die $!;
 }
@@ -232,7 +264,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 +277,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 +320,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+ \((\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 $!;
@@ -320,13 +353,16 @@ sub checksig_keyring ($) {
 
     debug " checksig keyring $keyringfile...";
 
-    open P, "-|", (qw(gpgv --status-fd=1 --keyring),
+    our @cmd = (qw(gpgv --status-fd=1 --keyring),
 		   $keyringfile,
-		   qw(dgit-tmp/plaintext.asc dgit-tmp/plaintext))
+		   qw(dgit-tmp/plaintext.asc dgit-tmp/plaintext));
+    debugcmd @cmd;
+
+    open P, "-|", @cmd
 	or die $!;
 
     while (<P>) {
-	next unless s/^\[GNUPG:\]: //;
+	next unless s/^\[GNUPG:\] //;
 	chomp or die;
 	debug " checksig| $_";
 	my @l = split / /, $_;
@@ -401,7 +437,7 @@ sub verifytag () {
 }
 
 sub checksuite () {
-    debug "checksuite";
+    debug "checksuite ($suitesfile)";
     open SUITES, "<", $suitesfile or die $!;
     while (<SUITES>) {
 	chomp;
@@ -437,16 +473,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 +492,7 @@ sub stunthook () {
     verifytag();
     checks();
     onwardpush();
+    debug "stunthook done.";
 }
 
 #----- git-upload-pack -----
@@ -487,6 +526,9 @@ sub argval () {
 sub parseargsdispatch () {
     die unless @ARGV;
 
+    delete $ENV{'GIT_DIR'}; # if not run via ssh, our parent git process
+    delete $ENV{'GIT_PREFIX'}; # sets these and they mess things up
+
     if ($ENV{'DGIT_DRS_DEBUG'}) {
 	$debug='=';
 	open DEBUG, ">&STDERR" or die $!;