aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-11 19:39:45 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-11 19:39:45 +0000
commit95002b562ccff00e84ca458e4c00b9ec12dbaeaa (patch)
tree87c8f8b5d8b25850664cf4a3968e76a33d577b1e
parent873c855389b1c4931530cceb185072b6a06b1de8 (diff)
downloadpaludis-95002b562ccff00e84ca458e4c00b9ec12dbaeaa.tar.gz
paludis-95002b562ccff00e84ca458e4c00b9ec12dbaeaa.tar.xz
Skip the sanity checks if we're not overwriting
-rwxr-xr-xebuild/utils/merge16
1 files changed, 9 insertions, 7 deletions
diff --git a/ebuild/utils/merge b/ebuild/utils/merge
index a314ead..a6ae28e 100755
--- a/ebuild/utils/merge
+++ b/ebuild/utils/merge
@@ -63,14 +63,16 @@ merge_this()
ff=$(basename "${f}" )
echo ">>> ${2#${top_dst}}/${ff}"
- if [[ -L "${2}/${ff}" ]] ; then
- if ! [[ -L "${f}" ]] ; then
- ebuild_notice "qa" "ROOT has '${2}/${ff}' as a non-symlink, " \
- "but IMAGE '${f}' is a symlink"
+ if [[ -e "${f}" ]] || [[ -h "${f}" ]] ; then
+ if [[ -L "${2}/${ff}" ]] ; then
+ if ! [[ -L "${f}" ]] ; then
+ ebuild_notice "qa" "ROOT has '${2}/${ff}' as a non-symlink, " \
+ "but IMAGE '${f}' is a symlink"
+ fi
+ elif [[ -L "${f}" ]] ; then
+ ebuild_notice "qa" "ROOT has '${2}/${ff}' as a symlink, " \
+ "but IMAGE '${f}' is a non-symlink"
fi
- elif [[ -L "${f}" ]] ; then
- ebuild_notice "qa" "ROOT has '${2}/${ff}' as a symlink, " \
- "but IMAGE '${f}' is a non-symlink"
fi
if [[ -L "${f}" ]] ; then