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

diff --git a/debian/changelog b/debian/changelog
index 08ed8266b07690fe9f287db25fdc47d2c056aa16..e6882e71ecc6a2bcdef18efa0793951ba2c0a124 100644 (file)
--- 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 701f588e643378c4a0097a1a5e6ee5238389786b..d1885101e6d4db90feac52c39adebc4137305baf 100755 (executable)
--- 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);
+                       }
                }
        }
 }