[debhelper-devel] [debhelper] 01/03: dh_install: Refactor --autodest handling

[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 a85e51cde13cd0f43f84f833e5e678382acf7c89
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Jun 26 13:49:30 2017 +0000

    dh_install: Refactor --autodest handling
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh_install | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dh_install b/dh_install
index 5a506e5..9b0eb0a 100755
--- a/dh_install
+++ b/dh_install
@@ -173,11 +173,14 @@ foreach my $package (getpackages()) {
 	if ($dh{EXCLUDE_FIND}) {
 		$exclude = '! \( '.$dh{EXCLUDE_FIND}.' \)';
 	}
-	
+
+	# With autodest, we can just pretend every pattern was on its own line
+	@install = map { [$_] } map { @$_ } @install if $dh{AUTODEST};
+
 	foreach my $set (@install) {
 		my $dest;
 		
-		if (! defined $dh{AUTODEST} && @$set > 1) {
+		if (@$set > 1) {
 			$dest=pop @$set;
 		}
 

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