aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-11 12:13:08 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-11 12:13:08 +0000
commit0c6af1f795cc03259348228cfbc96c42299fdfbe (patch)
treea2b26362726da2a383b7535483e50ee182900115
parent0259d62fb0d1bb43b1a36765f979cac1c42be134 (diff)
downloadpaludis-0c6af1f795cc03259348228cfbc96c42299fdfbe.tar.gz
paludis-0c6af1f795cc03259348228cfbc96c42299fdfbe.tar.xz
Tinker with if / else handling to avoid confusing certain broken bash versions
-rwxr-xr-xebuild/utils/merge8
1 files changed, 3 insertions, 5 deletions
diff --git a/ebuild/utils/merge b/ebuild/utils/merge
index c36eee8..064ef30 100755
--- a/ebuild/utils/merge
+++ b/ebuild/utils/merge
@@ -68,11 +68,9 @@ merge_this()
ebuild_notice "qa" "ROOT has '${2}/${ff}' as a non-symlink, " \
"but IMAGE '${f}' is a symlink"
fi
- else
- if [[ -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