Improve error output

git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@201 83718e91-0e4f-0410-abf4-91180603181f

9 files changed, 44 insertions, 42 deletions

diff --git a/src/util/git-add-thorn.pl b/src/util/git-add-thorn.pl
index 98c7760..275d72d 100755
--- a/src/util/git-add-thorn.pl
+++ b/src/util/git-add-thorn.pl
@@ -32,7 +32,7 @@ $ENV{'GIT_DIR'} = "$git_repo/.git";
 # links, and git refuses to follow them.  Instad, we copy the whole
 # thorn (using hard links), and then add the copy.
 
-# system "cd $git_root && $git_cmd add @files" or die;
+# system "cd '$git_root' && $git_cmd add @files" or die;
 
 my $srcdir = $git_root;
 my $dstdir = "$scratch/tmp-$thorn";
@@ -51,10 +51,12 @@ for my $file (@files) {
         die "ERROR: Cannot create hard link from \"$srcdir/$file\" to \"$dstdir/$file\"";
 }
 
-print "Executing: cd $dstdir && $git_cmd add @files\n" unless $silent;
-system "cd $dstdir && $git_cmd add @files $silencer";
-if ($?) {
-    die "Could not add thorn $thorn to git repository";
+if (@files) {
+    print "Executing: cd '$dstdir' && $git_cmd add @files\n" unless $silent;
+    system "cd '$dstdir' && $git_cmd add @files $silencer";
+    if ($?) {
+        die "Could not add thorn $thorn to git repository\nCommand was\n   cd '$dstdir' && $git_cmd add @files";
+    }
 }
 
 rmtree $dstdir or die;
diff --git a/src/util/git-commit-everything.pl b/src/util/git-commit-everything.pl
index 96a06f2..5e1d66b 100755
--- a/src/util/git-commit-everything.pl
+++ b/src/util/git-commit-everything.pl
@@ -37,22 +37,22 @@ system "$git_cmd commit -m $build_id $silencer";
 #    die "Could not commit";
 #}
 
-print "Executing: $git_cmd tag $build_id\n" unless $silent;
-system "$git_cmd tag $build_id $silencer";
+print "Executing: $git_cmd tag '$build_id'\n" unless $silent;
+system "$git_cmd tag '$build_id' $silencer";
 if ($?) {
-    die "Could not tag";
+    die "Could not tag\nCommand was\n   $git_cmd tag '$build_id'";
 }
 print "Formaline: Created git tag $build_id\n";
 
-print "Executing: $git_cmd branch -f $config_id\n" unless $silent;
-system "$git_cmd branch -f $config_id $silencer";
+print "Executing: $git_cmd branch -f '$config_id'\n" unless $silent;
+system "$git_cmd branch -f '$config_id' $silencer";
 if ($?) {
-    die "Could not update branch";
+    die "Could not update branch\nCommand was\n   $git_cmd branch -f '$config_id'";
 }
 print "Formaline: Updated git branch $config_id\n";
 
-print "Executing: $bindir/git-gc-repo.pl '$git_cmd' $git_repo\n" unless $silent;
-system "$bindir/git-gc-repo.pl '$git_cmd' $git_repo $silencer";
+print "Executing: '$bindir/git-gc-repo.pl' '$git_cmd' '$git_repo'\n" unless $silent;
+system "'$bindir/git-gc-repo.pl' '$git_cmd' '$git_repo' $silencer";
 if ($?) {
-    die "Could not collect garbage";
+    die "Could not collect garbage\nCommand was\n   '$bindir/git-gc-repo.pl' '$git_cmd' '$git_repo'";
 }
diff --git a/src/util/git-gc-repo.pl b/src/util/git-gc-repo.pl
index b02d5a4..d232cde 100755
--- a/src/util/git-gc-repo.pl
+++ b/src/util/git-gc-repo.pl
@@ -53,11 +53,11 @@ if ($reposize > $maxreposize) {
     print "Executing: $git_cmd gc\n" unless $silent;
     system "$git_cmd gc $silencer";
     if ($?) {
-        die "Could not compact repository";
+        die "Could not compact repository\nCommand was\n   $git_cmd gc";
     }
     
     # Determine new repository size
-    my $newreposize = `du -s $git_dir` or die;
+    my $newreposize = `du -s '$git_dir'` or die;
     $newreposize = (split ' ', $newreposize)[0];
     
     # Write new repository size
diff --git a/src/util/git-init-master-repo.pl b/src/util/git-init-master-repo.pl
index 0f8ea8a..83bf6dd 100755
--- a/src/util/git-init-master-repo.pl
+++ b/src/util/git-init-master-repo.pl
@@ -35,12 +35,12 @@ $ENV{'GIT_DIR'} = "$git_master_repo/.git";
 print "Executing: $git_cmd init-db\n" unless $silent;
 system "$git_cmd init-db $silencer";
 if ($?) {
-    die "Formaline: WARNING: Error while initialising master git repository";
+    die "Formaline: WARNING: Error while initialising master git repository\nCommand was\n   $git_cmd init-db";
 }
 print "Executing: $git_cmd config receive.denyCurrentBranch false\n" unless $silent;
 system "$git_cmd config receive.denyCurrentBranch false $silencer";
 if ($?) {
-    die "Formaline: WARNING: Error while configuring master git repository";
+    die "Formaline: Error while configuring master git repository\nCommand was\n   $git_cmd config receive.denyCurrentBranch false";
 }
 
 
diff --git a/src/util/git-init-repo.pl b/src/util/git-init-repo.pl
index c676251..f2a7261 100755
--- a/src/util/git-init-repo.pl
+++ b/src/util/git-init-repo.pl
@@ -35,12 +35,12 @@ $ENV{'GIT_DIR'} = "$git_repo/.git";
 print "Executing: $git_cmd init-db\n" unless $silent;
 system "$git_cmd init-db $silencer";
 if ($?) {
-    die "Formaline: WARNING: Error while initialising git repository";
+    die "Formaline: WARNING: Error while initialising git repository\nCommand was\n   $git_cmd init-db";
 }
 print "Executing: $git_cmd config receive.denyCurrentBranch false\n" unless $silent;
 system "$git_cmd config receive.denyCurrentBranch false $silencer";
 if ($?) {
-    die "Formaline: WARNING: Error while configuring git repository";
+    die "Formaline: WARNING: Error while configuring git repository\nCommand was\n   $git_cmd config receive.denyCurrentBranch false";
 }
 
 
diff --git a/src/util/git-lock.pl b/src/util/git-lock.pl
index c05a31a..9980833 100755
--- a/src/util/git-lock.pl
+++ b/src/util/git-lock.pl
@@ -35,7 +35,7 @@ while (! (mkdir $lockdir)) {
     # Wait some time
     my $unit = $waittime==1 ? "second" : "seconds";
     print "Git repository is busy; waiting $waittime $unit...\n";
-    system "sleep $waittime";
+    system "sleep '$waittime'";
     # Back off exponentially
     $waittime *= 2;
     $waittime = 1 if $waittime>1 && $waittime<2;
diff --git a/src/util/git-push-everything.pl b/src/util/git-push-everything.pl
index 8f5f111..10ad4dc 100755
--- a/src/util/git-push-everything.pl
+++ b/src/util/git-push-everything.pl
@@ -34,28 +34,28 @@ die unless -e "$git_master_repo/.git";
 print "Formaline: Pushing source tree to master git repository...\n";
 
 print "Executing: $git_cmd config receive.denyCurrentBranch false\n" unless $silent;
-system "$git_cmd --git-dir=$git_master_repo/.git config receive.denyCurrentBranch false $silencer";
+system "$git_cmd --git-dir='$git_master_repo/.git' config receive.denyCurrentBranch false $silencer";
 if ($?) {
-    die "Formaline: WARNING: Error while configuring master git repository";
+    die "Formaline: WARNING: Error while configuring master git repository\nCommand was\n   $git_cmd --git-dir='$git_master_repo/.git' config receive.denyCurrentBranch false";
 }
 
-print "Executing: $git_cmd push -v -f --all $git_master_repo\n" unless $silent;
-system "$git_cmd push -v -f --all $git_master_repo $silencer";
+print "Executing: $git_cmd push -v -f --all '$git_master_repo'\n" unless $silent;
+system "$git_cmd push -v -f --all '$git_master_repo' $silencer";
 if ($?) {
-    die "Could not push branches";
+    die "Could not push branches\nCommand was\n   $git_cmd push -v -f --all '$git_master_repo'";
 }
 
-print "Executing: $git_cmd push -v -f --tags $git_master_repo\n" unless $silent;
-system "$git_cmd push -v -f --tags $git_master_repo $silencer";
+print "Executing: $git_cmd push -v -f --tags '$git_master_repo'\n" unless $silent;
+system "$git_cmd push -v -f --tags '$git_master_repo' $silencer";
 if ($?) {
-    die "Could not push tags";
+    die "Could not push tags\nCommand was\n   $git_cmd push -v -f --tags '$git_master_repo'";
 }
 
-print "Executing: $bindir/git-gc-repo.pl '$git_cmd' $git_master_repo\n"
+print "Executing: '$bindir/git-gc-repo.pl' '$git_cmd' '$git_master_repo'\n"
     unless $silent;
-system "$bindir/git-gc-repo.pl '$git_cmd' $git_master_repo $silencer";
+system "'$bindir/git-gc-repo.pl' '$git_cmd' '$git_master_repo' $silencer";
 if ($?) {
-    die "Could not collect garbage";
+    die "Could not collect garbage\nCommand was\n   '$bindir/git-gc-repo.pl' '$git_cmd' '$git_master_repo'";
 }
 
 
@@ -65,16 +65,16 @@ if (defined $git_central_repo) {
     
     print "Formaline: Pushing to central repository $git_central_repo...\n";
     
-    print "Executing: $git_cmd push -v -f --all $git_central_repo\n"
+    print "Executing: $git_cmd push -v -f --all '$git_central_repo'\n"
         unless $silent;
-    system "$git_cmd push -v -f --all $git_central_repo $silencer";
+    system "$git_cmd push -v -f --all '$git_central_repo' $silencer";
     if ($?) {
-        die "Could not push branches";
+        die "Could not push branches\nCommand was\n   $git_cmd push -v -f --all '$git_central_repo'";
     }
     
-    print "$git_cmd push -v -f --tags $git_central_repo\n" unless $silent;
-    system "$git_cmd push -v -f --tags $git_central_repo $silencer";
+    print "$git_cmd push -v -f --tags '$git_central_repo'\n" unless $silent;
+    system "$git_cmd push -v -f --tags '$git_central_repo' $silencer";
     if ($?) {
-        die "Could not push tags";
+        die "Could not push tags\nCommand was\n   $git_cmd push -v -f --tags '$git_central_repo'";
     }
 }
diff --git a/src/util/git-rm-thorn.pl b/src/util/git-rm-thorn.pl
index 75769f1..b34692c 100755
--- a/src/util/git-rm-thorn.pl
+++ b/src/util/git-rm-thorn.pl
@@ -29,9 +29,9 @@ $ENV{'GIT_DIR'} = "$git_repo/.git";
 # git aborts after the first error
 for my $file (@files) {
     
-    print "Executing: $git_cmd rm --cached -r $file 2> /dev/null\n"
+    print "Executing: $git_cmd rm --cached -r '$file' 2> /dev/null\n"
         unless $silent;
-    system "$git_cmd rm --cached -r $file > /dev/null 2>&1";
+    system "$git_cmd rm --cached -r '$file' > /dev/null 2>&1";
     # Ignore errors
     #if ($?) {
     #    die "Could not remove thorn $thorn from git repository";
diff --git a/src/util/git-rm-unused-thorns.pl b/src/util/git-rm-unused-thorns.pl
index 1c8b4c9..3523277 100755
--- a/src/util/git-rm-unused-thorns.pl
+++ b/src/util/git-rm-unused-thorns.pl
@@ -34,9 +34,9 @@ file: for my $file (@files) {
         next file if $file =~ m{^arrangements/$thorn/};
     }
     
-    print "Executing: $git_cmd rm --cached -r $file\n"
+    print "Executing: $git_cmd rm --cached -r '$file'\n"
         unless $silent;
-    system "$git_cmd rm --cached -r $file > /dev/null 2>&1";
+    system "$git_cmd rm --cached -r '$file' > /dev/null 2>&1";
     # Ignore errors
     #if ($?) {
     #    die "Could not remove file $file from git repository";