[debhelper-devel] [debhelper] 02/02: dh: Remove logs before and not after the override target

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit a28eaa2639820103ee39dab833eee68fd7be1f90
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Oct 2 15:29:38 2016 +0000

    dh: Remove logs before and not after the override target
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 2 ++
 dh               | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d6f8a29..8c99707 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ debhelper (10.2.2) UNRELEASED; urgency=medium
   * Fix typo in changelog entry for release 10.2.  Thanks to
     Peter Pentchev for reporting it.
   * Deprecate all compat levels lower than 9.
+  * dh: Discard override log files before running rather than
+    after.
 
  -- Niels Thykier <niels at thykier.net>  Sun, 02 Oct 2016 09:52:08 +0000
 
diff --git a/dh b/dh
index 4acad26..975e533 100755
--- a/dh
+++ b/dh
@@ -842,6 +842,9 @@ sub run_override {
 		push @options, $opt unless grep { $_ eq $opt } @options;
 	}
 
+	# Discard any override log files before calling the override
+	# target
+	complex_doit("rm","-f","debian/*.debhelper.log") if not compat(9);
 	# This passes the options through to commands called
 	# inside the target.
 	$ENV{DH_INTERNAL_OPTIONS}=join("\x1e", @options);
@@ -849,7 +852,6 @@ sub run_override {
 	run("debian/rules", $override);
 	delete $ENV{DH_INTERNAL_OPTIONS};
 	delete $ENV{DH_INTERNAL_OVERRIDE};
-	complex_doit("rm","-f","debian/*.debhelper.log") if not compat(9);
 
 	# Update log for overridden command now that it has
 	# finished successfully.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git