summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Jones <carpaski@gentoo.org>2004-04-26 04:15:25 +0000
committerNicholas Jones <carpaski@gentoo.org>2004-04-26 04:15:25 +0000
commitb0c0646361a6bfa7f47c1eb22a07c96815fcd318 (patch)
treeaaf496f86c5886b513a0d27538fb297b50e3dc5a
parentinherit eutils for epatch (diff)
downloadhistorical-b0c0646361a6bfa7f47c1eb22a07c96815fcd318.tar.gz
historical-b0c0646361a6bfa7f47c1eb22a07c96815fcd318.tar.bz2
historical-b0c0646361a6bfa7f47c1eb22a07c96815fcd318.zip
Fix for the worldfile problem.
-rw-r--r--sys-apps/portage/portage-2.0.51_pre5.ebuild14
1 files changed, 8 insertions, 6 deletions
diff --git a/sys-apps/portage/portage-2.0.51_pre5.ebuild b/sys-apps/portage/portage-2.0.51_pre5.ebuild
index c83bae3c74e3..50133d3a53f2 100644
--- a/sys-apps/portage/portage-2.0.51_pre5.ebuild
+++ b/sys-apps/portage/portage-2.0.51_pre5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_pre5.ebuild,v 1.1 2004/04/25 20:01:50 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_pre5.ebuild,v 1.2 2004/04/26 04:15:25 carpaski Exp $
IUSE="build"
@@ -210,8 +210,8 @@ pkg_postinst() {
# They are identical. Delete the real file and symlink it.
rm "${OLDWORLD}"
ln -s "../../../var/lib/portage/world" "${OLDWORLD}"
- rm /etc/portage/sets/worldem
- ln -s "../../../var/lib/portage/world" "${OLDWORLD}"
+ rm /etc/portage/sets/world
+ ln -s "../../../var/lib/portage/world" "/etc/portage/sets/world"
else
# They don't match. Complain and do nothing.
ewarn "A world file exists in both ${ROOT}/var/cache/db/world and"
@@ -221,9 +221,11 @@ pkg_postinst() {
fi
else
# portage/world does not yet exist.
- ewarn "Moving world file into /etc/portage/sets/world"
- rm "${ROOT}/var/cache/edb/world"
- ln -s "../../../etc/portage/sets/world" "${ROOT}/var/cache/edb/world"
+ ewarn "Moving world file into ${NEWWORLD}"
+ cp "${OLDWORLD}" "${NEWWORLD}"
+ chown root:portage "${NEWWORLD}"
+ chmod 0660 "${NEWWORLD}"
+ ln -s "../../lib/portage/world" "${OLDWORLD}"
fi
fi