[debhelper-devel] [debhelper] 03/17: log_installed_files: Compute the helper name automatically

Niels Thykier nthykier at moszumanska.debian.org
Sat Apr 8 08:58:10 UTC 2017


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

nthykier pushed a commit to branch master
in repository debhelper.

commit 7274bbf85152df72fe818364e6beaa244a3159d1
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Apr 3 09:22:10 2017 +0000

    log_installed_files: Compute the helper name automatically
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Dh_Lib.pm | 4 ++--
 dh_install                 | 2 +-
 doc/PROGRAMMING            | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 7244805..21798e6 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -1457,9 +1457,9 @@ sub deprecated_functionality {
 }
 
 sub log_installed_files {
-	my ($name, $package, @patterns) = @_;
+	my ($package, @patterns) = @_;
 
-	my $log = generated_file($package, 'installed-by-' . $name);
+	my $log = generated_file($package, 'installed-by-' . basename($0));
 	open(my $fh, '>', $log);
 	for my $src (@patterns) {
 		print $fh "$src\n";
diff --git a/dh_install b/dh_install
index eb10586..f4c4e76 100755
--- a/dh_install
+++ b/dh_install
@@ -253,7 +253,7 @@ foreach my $package (getpackages()) {
 		}
 	}
 
-	log_installed_files('dh_install', $package, @installed);
+	log_installed_files($package, @installed);
 }
 
 if ($missing_files) {
diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index ceffa80..10cbade 100644
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -348,9 +348,9 @@ deprecated_functionality($warn_msg[, $rm_compat[, $rm_msg]])
 	The function will provide a separate diagnostic about which compat
 	level that will remove/removed the functionality if $rm_compat is
 	given.
-log_installed_files($name, $package, @patterns)
-	Creates a logfile (in debian/.debhelper/generated) for helper
-	$name’s processing of $package, which installed the files listed in
+log_installed_files($package, @patterns)
+	Creates a logfile (in debian/.debhelper/generated) for the helper's
+	processing of $package, which installed the files listed in
 	@patterns. This logfile will later be used by the dh_missing helper.
 
 Sequence Addons:

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




More information about the debhelper-devel mailing list