From 77eac3a8653b073670f500dbc173aee45577c032 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 May 2016 15:27:08 +0100
Subject: [PATCH] Do not call "warn" on failure of cleanup handler in END block
 (since warn has been made fatal and aborts the cleanup chain).

---
 debian/changelog | 2 ++
 dgit             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f3a88a2f..4c9e2907 100644
--- 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 91f43af0..507be273 100755
--- 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 $@;
     }
 };
 
-- 
2.30.2