export write_log

Avoids the ugly thunk in dh

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 963a8590b2fc8be14fd0bb331d20b4706808269d..b57c4d97d15c66faf1fb166ed82ca0c1480c7010 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -15,7 +15,7 @@ use vars qw(@ISA @EXPORT %dh);
            &filedoublearray &getpackages &basename &dirname &xargs %dh
            &compat &addsubstvar &delsubstvar &excludefile &package_arch
            &is_udeb &udeb_filename &debhelper_script_subst &escape_shell
-           &inhibit_log &load_log);
+           &inhibit_log &load_log &write_log);
 
 my $max_compat=7;
 

diff --git a/dh b/dh
index ab7ddb07884b54788a11f8b7197ec8e1c9949b3f..f557a6330ef660fc343fa828990c13902b741f41 100755 (executable)
--- a/dh
+++ b/dh
@@ -386,7 +386,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($sequence[$startpoint{$package}-1], $package);
+               write_log($sequence[$startpoint{$package}-1], $package);
        }
        elsif ($dh{REMAINING}) {
                # Start at the beginning so all remaining commands will get
@@ -479,15 +479,11 @@ sub run {
                        # been run by the rules file target.
                        my %packages=map { $_ => 1 } @packages;
                        map { delete $packages{$_} } @exclude;
-                       writelog($override_command, keys %packages);
+                       write_log($override_command, keys %packages);
                }
        }
 }
 
-sub writelog {
-       Debian::Debhelper::Dh_Lib::write_log(@_);
-}
-
 {
 my %targets;
 my $rules_parsed;