[debhelper-devel] [debhelper] 01/01: dh_installman: Fix regression with -P/dir
Niels Thykier
nthykier at moszumanska.debian.org
Wed Jul 5 08:23:30 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 4064870b59e87f01460e583687beb97b5a00f3a6
Author: Niels Thykier <niels at thykier.net>
Date: Wed Jul 5 08:22:19 2017 +0000
dh_installman: Fix regression with -P/dir
Fixes: f9999ffaa5995ebef7cc9c5dc1dc7efc10bb5604
Signed-off-by: Niels Thykier <niels at thykier.net>
---
debian/changelog | 4 ++++
dh_installman | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 385a33a..8640201 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ debhelper (10.6.2) UNRELEASED; urgency=medium
* Add a test case for #866570.
* dh_compress: Apply patch from Sven Joachim to fix a
regression in 10.5.1. (Closes: #866713)
+ * dh_installman: Fix regression introduced in 10.5.1 that
+ caused a "file not found" error when using -P with an
+ absolute argument. Thanks to Adrian Bunk for reporting
+ it over IRC.
-- Niels Thykier <niels at thykier.net> Mon, 03 Jul 2017 14:39:11 +0000
diff --git a/dh_installman b/dh_installman
index 4089d1d..ead1752 100755
--- a/dh_installman
+++ b/dh_installman
@@ -291,7 +291,8 @@ if (defined `man --version`) {
on_items_in_parallel(\@manpages_to_reencode, sub {
for my $manpage (@_) {
my $manpage_tmp = "${manpage}.dh-new";
- complex_doit "man --recode UTF-8 ./\Q$manpage\E > \Q$manpage_tmp\E";
+ my $manpage_cmd = ($manpage =~ m{^/}) ? $manpage : "./${manpage}";
+ complex_doit "man --recode UTF-8 \Q${manpage_cmd}\E > \Q$manpage_tmp\E";
# recode uncompresses compressed pages
rm_files($manpage) if $manpage =~ s/\.(gz|Z)$//;
rename_path($manpage_tmp, $manpage);
--
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