From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 7 Jan 2008 21:57:42 +0000 (-0500)
Subject: Support files with spaces in exclude mode. Closes: #459426
X-Git-Tag: 6.0.0~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5ec65e1c6ffa15fdd4f4b1d852398ad327be5eb2;p=debhelper.git

Support files with spaces in exclude mode. Closes: #459426
---

diff --git a/dh_installdocs b/dh_installdocs
index 956a7fb..0350f87 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -136,10 +136,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			    my ($dir_basename) = basename($doc);
 			    my $pwd=`pwd`;
 			    chomp $pwd;
-			    complex_doit("cd $doc/.. && find $dir_basename \\( -type f -or -type l \\)$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package \\;");
+			    complex_doit("cd '$doc/..' && find '$dir_basename' \\( -type f -or -type l \\)$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package \\;");
 			}
 			else {
-				doit("cp","-a",$doc,"$tmp/usr/share/doc/$package");
+				doit("cp", "-a", $doc, "$tmp/usr/share/doc/$package");
 			}
 		}
 		doit("chown","-R","0:0","$tmp/usr/share/doc");
diff --git a/dh_installexamples b/dh_installexamples
index dcd37ad..0f3651c 100755
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -87,10 +87,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			next if excludefile($example);
 			if (-d $example && $exclude) {
 				my ($dir_basename) = basename($example);
-				# Pity there's no cp --exclude ..
 				my $pwd=`pwd`;
 				chomp $pwd;
-				complex_doit("cd $example/.. && find $dir_basename -type f$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package/examples \\;");
+				complex_doit("cd '$example/..' && find '$dir_basename' -type f$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package/examples \\;");
 			}
 			else {
 				doit("cp", "-a", $example, "$tmp/usr/share/doc/$package/examples");