r1944: forgot this

[debhelper.git] / dh_movefiles

diff --git a/dh_movefiles b/dh_movefiles
index 2c8a63fd934bbc32f601839caeb331700f765b41..ba82a70b9a6808cff5130b97817515cea4ffbd2c 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -37,7 +37,7 @@ and more.
 
 Instead of moving files out of debian/tmp (the default), this option makes
 it move files out of some other directory. Since the entire contents of
-the sourcedir is moved, specifiying something like --sourcedir=/ is very
+the sourcedir is moved, specifying something like --sourcedir=/ is very
 unsafe, so to prevent mistakes, the sourcedir must be a relative filename;
 it cannot begin with a `/'.
 
@@ -130,20 +130,22 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                                $ret=1;
                                warning("$file not found (supposed to put it in $package)");
                        }
-                       $file=~s:^\Q$sourcedir\E/+::;
-                       my $cmd="(cd $sourcedir >/dev/null ; find $file ! -type d ";
-                       if ($dh{EXCLUDE_FIND}) {
-                               $cmd.="-a ! \\( $dh{EXCLUDE_FIND} \\) ";
+                       else {
+                               $file=~s:^\Q$sourcedir\E/+::;
+                               my $cmd="(cd $sourcedir >/dev/null ; find $file ! -type d ";
+                               if ($dh{EXCLUDE_FIND}) {
+                                       $cmd.="-a ! \\( $dh{EXCLUDE_FIND} \\) ";
+                               }
+                               $cmd.="-print || true) >> debian/movelist";
+                               complex_doit($cmd);
                        }
-                       $cmd.="-print || true) >> debian/movelist";
-                       complex_doit($cmd);
                }
                my $pwd=`pwd`;
                chomp $pwd;
                complex_doit("(cd $sourcedir >/dev/null ; tar --create --files-from=$pwd/debian/movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)");
                # --remove-files is not used above because tar then doesn't
                # preserve hard links
-               complex_doit("(cd $sourcedir >/dev/null ; cat $pwd/debian/movelist | xargs rm -f)");
+               complex_doit("(cd $sourcedir >/dev/null ; tr '\\n' '\\0' < $pwd/debian/movelist | xargs -0  -i rm -f '{}')");
                doit("rm","-f","debian/movelist");
        }
 }