summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2014-01-26 19:12:19 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2014-03-05 18:29:05 +0000
commitccc64aa5e65a4093c03d6313d86abd879033b0ec (patch)
tree407ee9b140e9f02a923aa45ebb2a24c29da20553
parentae113bf6b8494b60a7653c591c4719aea6ff9e4f (diff)
dgit-repos-server: more debugging output
-rwxr-xr-xdgit-repos-server25
1 files changed, 18 insertions, 7 deletions
diff --git a/dgit-repos-server b/dgit-repos-server
index 5e83fc5..2cc650d 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 $!;
}
@@ -438,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();
@@ -455,6 +465,7 @@ sub stunthook () {
verifytag();
checks();
onwardpush();
+ debug "stunthook done.";
}
#----- git-upload-pack -----