From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 18 May 2009 16:49:10 +0000 (-0400)
Subject: dh: Avoid writing log after override_dh_clean is run. Closes: #529228
X-Git-Tag: 7.2.14~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=783e5fded73bc32dc46c2e01e00c898ca70c4977;p=debhelper.git

dh: Avoid writing log after override_dh_clean is run. Closes: #529228
---

diff --git a/debian/changelog b/debian/changelog
index 08ed826..e6882e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (7.2.14) UNRELEASED; urgency=low
+
+  * dh: Avoid writing log after override_dh_clean is run. Closes: #529228
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 18 May 2009 12:48:37 -0400
+
 debhelper (7.2.13) unstable; urgency=low
 
   * dh_auto_configure: Pass --skipdeps safely via PERL_AUTOINSTALL.
diff --git a/dh b/dh
index 701f588..d188510 100755
--- a/dh
+++ b/dh
@@ -471,9 +471,13 @@ sub run {
 			# Need to handle logging for overriden commands here,
 			# because the actual debhelper command may not have
 			# been run by the rules file target.
-			my %packages=map { $_ => 1 } @packages;
-			map { delete $packages{$_} } @exclude;
-			write_log($override_command, keys %packages);
+			# (But avoid logging for dh_clean since it removes
+			# the log earlier.)
+			if ($override_command ne 'dh_clean') {
+				my %packages=map { $_ => 1 } @packages;
+				map { delete $packages{$_} } @exclude;
+				write_log($override_command, keys %packages);
+			}
 		}
 	}
 }