aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2011-12-20 06:09:24 -0100
committerJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2011-12-20 06:09:24 -0100
commitf23b1243fc6ee43612633723ff2d0d92870bce51 (patch)
tree658f235f6d4758d0fff1c6051450bc6e75b66ad3
parent@£§§@§£ - Next time make sure your "fat" finger doesn't add extra charac... (diff)
downloadcatalyst-f23b1243fc6ee43612633723ff2d0d92870bce51.tar.gz
catalyst-f23b1243fc6ee43612633723ff2d0d92870bce51.tar.bz2
catalyst-f23b1243fc6ee43612633723ff2d0d92870bce51.zip
Make sure portage updates itself at the start of stage1 - thanks to Zac for noticing the issue.
-rw-r--r--targets/support/chroot-functions.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index c454aaf..af693e8 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -165,8 +165,9 @@ setup_pkgmgr(){
# We need to merge our package manager with USE="build" set in case it is
# portage to avoid frying our /etc/make.conf file. Otherwise, we could
# just let emerge system could merge it.
+ # Use --update or portage won't reinstall the same version.
[ -e /etc/make.conf ] && echo 'USE="${USE} build"' >> /etc/make.conf
- run_merge --oneshot --nodeps sys-apps/portage
+ run_merge --oneshot --nodeps --update sys-apps/portage
sed -i '/USE="${USE} build"/d' /etc/make.conf
}