From: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
Date: Tue, 20 Dec 2011 07:14:05 +0000 (-0100)
Subject: Make sure portage updates itself at the start of stage1 - thanks to Zac for noticing... 
X-Git-Tag: CATALYST-2.0.8~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=900554b0b067e76d3806e520357d91adbfa4fa0c;p=catalyst.git

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

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 277fdc21..74a75659 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
 }