[debhelper-devel] [debhelper] 02/06: dh: Support symbolic paths in NOOP promises

[Niels Thykier]

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

nthykier pushed a commit to branch experimental/flatpak-support
in repository debhelper.

commit 54fa69306e3d20d959d2da13de5dd4007c11122a
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Oct 18 20:22:15 2016 +0000

    dh: Support symbolic paths in NOOP promises
---
 dh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dh b/dh
index 3d26826..7802307 100755
--- a/dh
+++ b/dh
@@ -1061,7 +1061,11 @@ sub can_skip {
 			if ($type eq 'tmp') {
 				foreach my $package (@packages) {
 					my $tmp = tmpdir($package);
-					return 0 if -e "$tmp/$need";
+					my $path = $need;
+					if (substr($need, 0, 1) eq '$') {
+						$path = get_rel_installation_directory(substr($need, 1));
+					}
+					return 0 if -e "${tmp}/${path}";
 				}
 			} elsif ($type eq 'pkgfile' or $type eq 'pkgfile-logged') {
 				my $pkgs;

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