Do not call "warn" on failure of cleanup handler in END block (since warn has been...

diff --git a/debian/changelog b/debian/changelog
index f3a88a2fe8a7675f7c1d1186d0896b2f56a80ac9..4c9e290786e5a720d8b9d2e00845ade8f0103190 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 91f43af087372c02b0f6ad719f93a60b07a94002..507be273f3f0b4c5b4debb44de0c060e62eaeb53 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 $@;
     }
 };