aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-05 19:05:33 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-05 19:05:33 +0000
commit7bc04681ef00f381ed52c8669ccf5de8c5dc2dfb (patch)
tree9c66e422370f895833908879ec30e694b609f77b
parent9e8218746d7497e3d9941e53bd5db4d1f0b50dec (diff)
downloadpaludis-7bc04681ef00f381ed52c8669ccf5de8c5dc2dfb.tar.gz
paludis-7bc04681ef00f381ed52c8669ccf5de8c5dc2dfb.tar.xz
Make merge actually merge things...
-rw-r--r--ebuild/builtin_merge.bash5
1 files changed, 4 insertions, 1 deletions
diff --git a/ebuild/builtin_merge.bash b/ebuild/builtin_merge.bash
index 9655f34..f7751c7 100644
--- a/ebuild/builtin_merge.bash
+++ b/ebuild/builtin_merge.bash
@@ -19,6 +19,8 @@
builtin_merge()
{
+ ebuild_section "Merging to '${ROOT:-/}'..."
+
if [[ -n "${D}" ]] && [[ -d "${D}" ]] ; then
if [[ -n "${CONFIG_PROTECT}" ]] ; then
local d f
@@ -34,13 +36,14 @@ builtin_merge()
fi
install -d "${ROOT}/" || die "couldn't make \${ROOT} (\"${ROOT}\")"
- if [[ -d "${D}" ]] && [[ ${D}/* != "${D}/*" ]] ; then
+ if [[ -d "${D}" ]] && [[ $(echo ${D}/* ) != "${D}/*" ]] ; then
cp --remove-destination -vdfpR "${D}/"* "${ROOT}/" \
|| die "builtin_merge failed"
fi
fi
local dbdir="${ROOT}"/var/db/pkg/"${CATEGORY}/${PF}"
+ ebuild_section "Writing VDB entry to '${dbdir}'..."
install -d "${dbdir}" || die "couldn't make pkg db directory (\"${dbdir}\")"
local v