Fix logging at end of an override target that never actually runs the overridden...

diff --git a/debian/changelog b/debian/changelog
index 58e8d55e0f93c57d36613c44e1093e3ae7454b2e..06adf08edd9fc9d58bced7b6fe86215569ff3659 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (8.1.2) UNRELEASED; urgency=low
+
+  * Fix logging at end of an override target that never actually runs
+    the overridden command. Closes: #613418
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 14 Feb 2011 14:21:38 -0400
+
 debhelper (8.1.1) unstable; urgency=low
 
   * dh_strip, dh_makeshlibs: use triplet-objdump, triplet-objcopy and

diff --git a/dh b/dh
index 9e6fa04e65d8d1e3dde932690d6f0c232576a94b..5a6679e5680ea03e865e9802c0ed3ef373e94c50 100755 (executable)
--- a/dh
+++ b/dh
@@ -689,8 +689,8 @@ sub run {
                        if ($override_command ne 'dh_clean') {
                                my %packages=map { $_ => 1 } @packages;
                                map { delete $packages{$_} } @exclude;
-                               commit_override_log(keys %packages);
                                write_log($override_command, keys %packages);
+                               commit_override_log(keys %packages);
                        }
 
                        delete $ENV{DH_INTERNAL_OPTIONS};