* dh_install{,docs,examples}: Avoid infinite recursion when told to

  install a directory ending with "/." (slashdot effect?) when exclusion is
  enabled. Emulate the behavior of cp in this case. Closes: #253234
* dh_install: Fix #459426 here too.

1 files changed, 4 insertions, 5 deletions

diff --git a/dh_install b/dh_install
index 47c00db2..eda38962 100755
--- a/dh_install
+++ b/dh_install
@@ -9,7 +9,6 @@ dh_install - install files into package build directories
 use strict;
 use File::Find;
 use Debian::Debhelper::Dh_Lib;
-use Cwd q{abs_path};
 
 =head1 SYNOPSIS
 
@@ -176,14 +175,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			}
 			
 			if (-d $src && $exclude) {
-				my ($dir_basename) = basename(abs_path($src));
-				# Pity there's no cp --exclude ..
+				my $basename = basename($src);
+				my $dir = ($basename eq '.') ? $src : "$src/..";
 				my $pwd=`pwd`;
 				chomp $pwd;
-				complex_doit("cd $src/.. && find $dir_basename $exclude \\( -type f -or -type l \\) -exec cp --parents -dp {} $pwd/$tmp/$dest/ \\;");
+				complex_doit("cd '$dir' && find '$basename' $exclude \\( -type f -or -type l \\) -exec cp --parents -dp {} $pwd/$tmp/$dest/ \\;");
 				# cp is annoying so I need a separate pass
 				# just for empty directories
-				complex_doit("cd $src/.. && find $dir_basename $exclude \\( -type d -and -empty \\) -exec cp --parents -a {} $pwd/$tmp/$dest/ \\;");
+				complex_doit("cd '$dir' && find '$basename' $exclude \\( -type d -and -empty \\) -exec cp --parents -a {} $pwd/$tmp/$dest/ \\;");
 			}
 			else {
 				doit("cp", "-a", $src, "$tmp/$dest/");