aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-10 23:48:58 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-10 23:48:58 +0000
commitdf7f43b72736428f2309d444c98db6e2071629a9 (patch)
treecd118af506f618acb4f3cab7781ffbbfe4a45f68
parentd58c9fa0385f67b293f0210c9dd24f4ef6ec4868 (diff)
downloadpaludis-df7f43b72736428f2309d444c98db6e2071629a9.tar.gz
paludis-df7f43b72736428f2309d444c98db6e2071629a9.tar.xz
Don't try to copy the contents of device files
-rwxr-xr-xebuild/utils/merge2
1 files changed, 1 insertions, 1 deletions
diff --git a/ebuild/utils/merge b/ebuild/utils/merge
index ea10216..d706b7d 100755
--- a/ebuild/utils/merge
+++ b/ebuild/utils/merge
@@ -93,7 +93,7 @@ merge_this()
r=1
fi
else
- if ! cp -p "${f}" "${2}"/ ; then
+ if ! cp -pR "${f}" "${2}"/ ; then
echo "error installing file ${f}"
r=1
else