From: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
Date: Mon, 3 Sep 2012 03:08:30 +0000 (+0000)
Subject: Fix optional update of seed_stage.
X-Git-Tag: Catalyst-2.0.11~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0393146a3894326a1dbf8642e42902762eb987d9;p=catalyst.git

Fix optional update of seed_stage.
---

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 2c4dacac..c26bd726 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -18,18 +18,20 @@ then
 	exit 1
 fi
 
+# Update stage3
+if [ -n "${clst_update_seed_cache}" ]; then
+	echo "Updating seed stage..."
+	clst_root_path=/ run_merge "--update --deep --newuse @world"
+else
+	echo "Skipping seed stage update..."
+fi
+
 ## START BUILD
 # First, we drop in a known-good baselayout
 [ -e /etc/portage/make.conf ] && \
 	echo 'USE="${USE} -build"' >> /etc/portage/make.conf
 run_merge "--oneshot --nodeps sys-apps/baselayout"
 
-# Update stage3
-#UPDATE_SEED_STAGE="yes"
-if [ -n "${UPDATE_SEED_STAGE}" ]; then
-	echo "Updating seed stage..."
-	clst_root_path=/ run_merge "--update --deep --newuse @world"
-fi
 sed -i '/USE="${USE} -build"/d' /etc/portage/make.conf
 
 # Next, we install the package manager