Make sure portage updates itself at the start of stage1 - thanks to Zac for noticing...

[catalyst.git] / targets / support / chroot-functions.sh

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 277fdc210e58435acd3595048d883e6f76e07c3e..74a7565995e1696dc161cc340c78437e8dc37ffb 100644 (file)
--- 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
 }