[debhelper-devel] [debhelper] 01/01: Revert "glob_expand: Special-case "." as dir"

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit fd71f39f38eacd417c602c4495626bdac5a438ad
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Jun 30 06:09:17 2017 +0000

    Revert "glob_expand: Special-case "." as dir"
    
    This reverts commit 25e56c374cb7f6ea3da8b8046764b36caa56ea02.
    
    Turns out this breaks the world if people use entries with leading
    slash (and they do).
---
 Debian/Debhelper/Dh_Lib.pm | 4 +---
 debian/changelog           | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 0bae5a4..03337b6 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -967,9 +967,7 @@ sub glob_expand {
 	for my $pattern (@patterns) {
 		my @m;
 		for my $dir (@dirs) {
-			# Special-case "." because it looks nicer that way.
-			my $full_pattern = ($dir eq '.' ? $pattern : "$dir/$pattern");
-			@m = bsd_glob($full_pattern, GLOB_CSH & ~(GLOB_NOMAGIC|GLOB_TILDE));
+			@m = bsd_glob("$dir/$pattern", GLOB_CSH & ~(GLOB_NOMAGIC|GLOB_TILDE));
 			last if @m;# > 1 or (@m and (-l $m[0] or -e _));
 		}
 		if (not @m) {
diff --git a/debian/changelog b/debian/changelog
index 4c4e133..82abaab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ debhelper (10.6.1) UNRELEASED; urgency=medium
 
   * Makefile: Enable running some tasks in parallel to better
     utilize multiple cores.
+  * Dh_Lib: Revert a change that caused dh_install (and other
+    tools) to take filenames as absolute if they started with
+    a leading slash.  Thanks to Sven Joachim for the prompt
+    discovery and notification.  (Closes: #866570)
 
  -- Niels Thykier <niels at thykier.net>  Thu, 29 Jun 2017 19:44:14 +0000
 

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