X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_movefiles;h=e9439bded17c2241eb06b2542621f417c79fc2d9;hb=18a0da8092ea9f3dc48bca92b36f592af25a608d;hp=b146b8e90f1d313e8c1a086091cc4efe5abdaf9b;hpb=0952ac2e9995da8abe149f3e42b3b8d9d2797112;p=debhelper.git diff --git a/dh_movefiles b/dh_movefiles index b146b8e..e9439bd 100755 --- a/dh_movefiles +++ b/dh_movefiles @@ -112,7 +112,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # Now we need to expand wildcards in @tomove. # This is only necessary in pre-v3 land -- as of v3, the - # expension is automatically done by filearray(). + # expansion is automatically done by filearray(). if (@tomove && compat(2)) { my @filelist=(); foreach (@tomove) { @@ -153,17 +153,17 @@ foreach my $package (@{$dh{DOPACKAGES}}) { 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 ; tr '\\n' '\\0' < $pwd/debian/movelist | xargs -0 -i rm -f '{}')"); + complex_doit("(cd $sourcedir >/dev/null ; tr '\\n' '\\0' < $pwd/debian/movelist | xargs -0 rm -f)"); doit("rm","-f","debian/movelist"); } } -# If $ret is set, we wern't actually able to find some +# If $ret is set, we weren't actually able to find some # files that were specified to be moved, and we should # exit with the code in $ret. This program puts off # exiting with an error until all files have been tried # to be moved, because this makes it easier for some -# packages that arn't always sure exactly which files need +# packages that aren't always sure exactly which files need # to be moved. exit $ret;