]> git.donarmstrong.com Git - debhelper.git/commitdiff
use Dh_Lib write_log
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 17 Feb 2009 18:35:46 +0000 (13:35 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 27 Feb 2009 20:13:55 +0000 (15:13 -0500)
(cherry picked from commit 9d700975929417fe72bf46271c694ccb09d1c905)

dh

diff --git a/dh b/dh
index ea541b18900a4bf231014864387b219db6b73d1c..bc5cf5655bcabbf41d19811df99ea11b9b08b452 100755 (executable)
--- a/dh
+++ b/dh
@@ -376,7 +376,7 @@ foreach my $package (@packages) {
                # no commands remain to run after it, communicating to
                # future dh instances that the specified command should not
                # be run again.
-               writelog($package, $sequence[$startpoint{$package}-1]);
+               writelog($sequence[$startpoint{$package}-1], $package);
        }
        elsif ($dh{REMAINING}) {
                # Start at the beginning so all remaining commands will get
@@ -470,7 +470,7 @@ sub run {
                        # been run by the rules file target.
                        my %packages=map { $_ => 1 } @packages;
                        map { delete $packages{$_} } @exclude;
-                       Debian::Debhelper::Dh_Lib::write_log($override_command, keys %packages);
+                       writelog($override_command, keys %packages);
                }
        }
 }
@@ -489,15 +489,9 @@ sub loadlog {
        close LOG;
        return @log;
 }
-               
+
 sub writelog {
-       my $package=shift;
-       my $cmd=shift;
-       my $ext=pkgext($package);
-       
-       open(LOG, ">>", "debian/${ext}debhelper.log") || error("failed to write to log");
-       print LOG $cmd."\n";
-       close LOG;
+       Debian::Debhelper::Dh_Lib::write_log(@_);
 }
 
 {