[debhelper-devel] [debhelper] 01/01: dh_install: Avoid d/tmp/d/tmp/<path> on failure

[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 a4c2ca1df85cc9271a2c837bde183bd4de60cd8d
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jan 2 15:44:00 2016 +0000

    dh_install: Avoid d/tmp/d/tmp/<path> on failure
    
    If given a glob that starts with d/tmp, which fails to match, then
    skip the "d/tmp"-fallback.  Otherwise we will end up with a duplicated
    "d/tmp/d/tmp/<path>" and people will think debhelper is broken.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 3 +++
 dh_install       | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bfccb6b..c0dbc06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ debhelper (9.20151225+unreleased) UNRELEASED; urgency=medium
   * Dh_Lib.pm: Pass "-S" to dpkg-parsechangelog when requesting
     the Version field.
   * Drop compat level 3.
+  * dh_install: Only fallback to debian/tmp if the given glob
+    does not start with debian/tmp.  This should make the
+    output on failures less weird.
 
  -- Niels Thykier <niels at thykier.net>  Sat, 26 Dec 2015 20:13:36 +0000
 
diff --git a/dh_install b/dh_install
index 769d9d4..f7275c9 100755
--- a/dh_install
+++ b/dh_install
@@ -176,7 +176,8 @@ foreach my $package (getpackages()) {
 			if (! compat(6)) {
 				# Fall back to looking in debian/tmp.
 				if (! @found || ! (-e $found[0] || -l $found[0])) {
-					@found = glob "debian/tmp/$glob";
+					@found = glob "debian/tmp/$glob"
+						if $glob !~ m{(?:\./)?debian/tmp/};
 				}
 			}
 			push @filelist, @found;

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