chiark / gitweb /
Do not call "warn" on failure of cleanup handler in END block (since warn has been...
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 22 May 2016 14:27:08 +0000 (15:27 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 1 Jul 2016 21:37:38 +0000 (22:37 +0100)
debian/changelog
dgit

index f3a88a2..4c9e290 100644 (file)
@@ -10,6 +10,8 @@ dgit (1.5~~) unstable; urgency=medium
   Bugfixes:
   * When cleaning up after failed clone, stat the to-be-cleaned-up
     directory before running rmtree on it.  Closes:#796773.
+  * Do not call "warn" on failure of cleanup handler in END block
+    (since warn has been made fatal and aborts the cleanup chain).
 
   Test suite:
   * When sbuild fails, do not crash due to sed not finding the log
diff --git a/dgit b/dgit
index 91f43af..507be27 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -155,7 +155,7 @@ END {
     local ($?);
     foreach my $f (@end) {
        eval { $f->(); };
-       warn "$us: cleanup: $@" if length $@;
+       print STDERR "$us: cleanup: $@" if length $@;
     }
 };