[gentoo-commits] proj/catalyst:master commit in: targets/stage1/, modules/

[gentoo-commits] proj/catalyst:master commit in: targets/stage1/, modules/

[Jorge Manuel B. S. Vicetto]

commit:     e643d75151b22c2f5a7b8ae5a309c4114bd728a9
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 03:17:37 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 03:17:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=e643d751

Let's see if we can update the seed stage and fix bug 397505.

---
 modules/stage1_target.py        |    5 +++++
 targets/stage1/stage1-chroot.sh |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/modules/stage1_target.py b/modules/stage1_target.py
index ea29bb0..773e3c8 100644
--- a/modules/stage1_target.py
+++ b/modules/stage1_target.py
@@ -13,7 +13,9 @@ class stage1_target(generic_stage_target):
 	def __init__(self,spec,addlargs):
 		self.required_values=[]
 		self.valid_values=["chost"]
+		self.valid_values.extend(["update_seed"])
 		generic_stage_target.__init__(self,spec,addlargs)
+        self.set_update_seed()
 	
 	def set_stage_path(self):
 		self.settings["stage_path"]=normpath(self.settings["chroot_path"]+self.settings["root_path"])
@@ -95,6 +97,9 @@ class stage1_target(generic_stage_target):
 		self.mounts.append("/tmp/stage1root/proc")
 		self.mountmap["/tmp/stage1root/proc"]="/proc"
 
+	def set_update_seed(self):
+		if self.settings.has_key(self.settings["update_seed"]):
+			self.settings["update_seed_cache"]=self.settings["update_seed"]
 
 def register(foo):
 	foo.update({"stage1":stage1_target})

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 00f390d..641f5c3 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -25,7 +25,7 @@ fi
 run_merge "--oneshot --nodeps sys-apps/baselayout"
 
 # Update stage3
-UPDATE_SEED_STAGE="yes"
+#UPDATE_SEED_STAGE="yes"
 if [ -n ${UPDATE_SEED_STAGE} ]; then
 	echo "Updating seed stage..."
 	clst_root_path=/ run_merge "--update --deep --newuse @world"