dgit-repos-server: more debugging output

diff --git a/dgit-repos-server b/dgit-repos-server
index 5e83fc592ecda344a30b035b6e3eb637471936cd..2cc650d03f61dca4f8633401bd3eb77929103898 100755 (executable)
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -155,13 +155,17 @@ sub reject ($) {
     die "dgit-repos-server: reject: $why\n";
 }
 
     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(\@_);
     }
     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;
     $!=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);
     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 $!";
 }
 
     !$r or die "create new repo failed failed: $r $!";
 }
 


@@ -202,7 +208,7 @@ END
 sub maybeinstallprospective () {
     return if $destrepo eq $realdestrepo;
 
 sub maybeinstallprospective () {
     return if $destrepo eq $realdestrepo;
 

-    debug " show-ref ...";
+    debug " show-ref ($destrepo) ...";

 
     my $child = open SR, "-|";
     defined $child or die $!;
 
     my $child = open SR, "-|";
     defined $child or die $!;


@@ -222,9 +228,11 @@ sub maybeinstallprospective () {
            die;
        die if $got{$wh}++;
     }
            die;
        die if $got{$wh}++;
     }

+    debug "installprospective ?";

     die if grep { !$_ } values %got;
     $!=0; $?=0; close SR or die "$? $!";
 
     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 $!;
 }
     rename $destrepo, $realdestrepo or die $!;
     remove "$destrepo.lock" or die $!;
 }


@@ -438,16 +446,18 @@ sub checks () {
 }
 
 sub onwardpush () {
 }
 
 sub onwardpush () {

+    my @cmd = (qw(git send-pack), $destrepo,
+              "$commit:refs/dgit/$suite",
+              "$tagval:refs/tags/$tagname");
+    debugcmd @cmd;

     $!=0;
     $!=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";
     !$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();
     chdir $workrepo or die "chdir $workrepo: $!";
     mkdir "dgit-tmp" or $!==EEXIST or die $!;
     readupdates();


@@ -455,6 +465,7 @@ sub stunthook () {
     verifytag();
     checks();
     onwardpush();
     verifytag();
     checks();
     onwardpush();

+    debug "stunthook done.";

 }
 
 #----- git-upload-pack -----
 }
 
 #----- git-upload-pack -----