Avoid writing debhelper log files in no-act mode. Closes: #640586

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 5a7c3e4a696172de077ba3f387241d0fa162517b..40c33e84722606c64b8afa293f3f65e2271cbaa1 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -146,6 +146,8 @@ sub write_log {
        my $cmd=shift;
        my @packages=@_;
 
+       return if $dh{NO_ACT};
+
        foreach my $package (@packages) {
                my $log=logfile($package);
                open(LOG, ">>", $log) || error("failed to write to ${log}: $!");
@@ -157,6 +159,8 @@ sub write_log {
 sub commit_override_log {
        my @packages=@_;
 
+       return if $dh{NO_ACT};
+
        foreach my $package (@packages) {
                my @log=map { remove_override($_) } load_log($package);
                my $log=logfile($package);

diff --git a/debian/changelog b/debian/changelog
index 72f8f3d0f1f31139658f25c56607f19873a9c7fa..13a755d4f7a1edefb8336edd5803ae8c24430470 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ debhelper (8.9.7) UNRELEASED; urgency=low
     for the binary target when all packages being acted on are indep.
   * debhelper no longer build-depends on man-db or file, to ease bootstrapping.
   * Remove obsolete versioned dependency on perl-base.
+  * Avoid writing debhelper log files in no-act mode. Closes: #640586
 
  -- Joey Hess <joeyh@debian.org>  Mon, 29 Aug 2011 20:18:01 -0400