aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-11 12:36:16 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-11 12:36:16 +0000
commitad1cce1f7808420fb4f6ec5290da49ab323a7e8d (patch)
tree8488e816e31b4d4b974a99a88058957b7eecc6c8
parent0c6af1f795cc03259348228cfbc96c42299fdfbe (diff)
downloadpaludis-ad1cce1f7808420fb4f6ec5290da49ab323a7e8d.tar.gz
paludis-ad1cce1f7808420fb4f6ec5290da49ab323a7e8d.tar.xz
Avoid text file busy silliness
-rwxr-xr-xebuild/utils/merge2
1 files changed, 1 insertions, 1 deletions
diff --git a/ebuild/utils/merge b/ebuild/utils/merge
index 064ef30..7e07ffb 100755
--- a/ebuild/utils/merge
+++ b/ebuild/utils/merge
@@ -105,7 +105,7 @@ merge_this()
r=1
fi
else
- if ! cp -pR "${f}" "${2}"/ ; then
+ if ! cp --remove-destination -pR "${f}" "${2}"/ ; then
echo "error installing file ${f}"
r=1
else