summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-05-30 14:45:55 -0400
committerJoey Hess <joey@kitenet.net>2011-05-30 14:45:55 -0400
commit30b95fc565a4ef342cdc4902d2a7ef7428cb3bda (patch)
tree4d221021823a8ae41ce57fbf93dc7620d56cf8dc
parent9a43d7dbf76c71949b98522f0a80f05e1115a3d6 (diff)
dh_movefiles: Optimise use of xargs. Closes: #627737
-rw-r--r--debian/changelog1
-rwxr-xr-xdh_movefiles2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 47a6618..8404462 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ debhelper (8.1.7) UNRELEASED; urgency=low
* Fix example. Closes: #627534
* Fix error message. Closes: #628053
+ * dh_movefiles: Optimise use of xargs. Closes: #627737
-- Joey Hess <joeyh@debian.org> Sat, 21 May 2011 15:24:19 -0400
diff --git a/dh_movefiles b/dh_movefiles
index b146b8e..3f59d9e 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -153,7 +153,7 @@ 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");
}
}