aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-15 22:01:31 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-15 22:01:31 +0000
commite075ee710000cd5c0e2c7ea930d18d59eb155f85 (patch)
treee349958366b4c4a7cd72ed2d8fcb37e640ce78e3
parent3e9740d94b127d2dbab4e99d085c89b05d03bbbd (diff)
downloadpaludis-e075ee710000cd5c0e2c7ea930d18d59eb155f85.tar.gz
paludis-e075ee710000cd5c0e2c7ea930d18d59eb155f85.tar.xz
Don't preserve timestamps on merge
-rwxr-xr-xebuild/utils/merge3
1 files changed, 2 insertions, 1 deletions
diff --git a/ebuild/utils/merge b/ebuild/utils/merge
index 2c478e3..dbb8176 100755
--- a/ebuild/utils/merge
+++ b/ebuild/utils/merge
@@ -138,7 +138,8 @@ merge_this()
mv "${f}" "${fn}"
fi
fi
- if ! cp --remove-destination -pR -- "${fn}" "${2}"/ ; then
+ if ! cp -pR --remove-destination --no-preserve=timestamps \
+ -- "${fn}" "${2}"/ ; then
echo "error installing file ${fn}"
r=1
else