[gentoo-commits] proj/catalyst:catalyst_2 commit in: targets/support/

["Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>]

commit:     900554b0b067e76d3806e520357d91adbfa4fa0c
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 07:14:05 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 07:14:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=900554b0

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

---
 targets/support/chroot-functions.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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