From 1c8b5da68e10092a6174021ef6e70f317ef3856f Mon Sep 17 00:00:00 2001 From: "John P. Davis" Date: Fri, 2 Apr 2004 21:09:10 +0000 Subject: [PATCH] fixing the livecd-stage1 use situation git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@341 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 ++++- modules/targets.py | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a33acf51..c126890c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.33 2004/04/01 20:00:18 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.34 2004/04/02 21:09:10 zhen Exp $ + + 02 Apr 2004; John Davis modules/targets.py: + use broken for grp, livecd-stage1, tinderbox, etc. fixed 01 Apr 2004; John Davis livecd/runscript/default-runscript.sh: diff --git a/modules/targets.py b/modules/targets.py index 866da00a..fc2cc306 100644 --- a/modules/targets.py +++ b/modules/targets.py @@ -1,6 +1,6 @@ # Distributed under the GNU General Public License version 2 # Copyright 2003-2004 Gentoo Technologies, Inc. -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/targets.py,v 1.98 2004/04/02 18:44:00 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/targets.py,v 1.99 2004/04/02 21:09:10 zhen Exp $ import os,string,imp,types,shutil from catalyst_support import * @@ -216,10 +216,13 @@ class generic_stage_target(generic_target): if self.settings["target"]=="grp": myusevars.append("bindist") myusevars.extend(self.settings["grp/use"]) + myf.write('USE="'+string.join(myusevars)+'"\n') elif self.settings["target"]=="tinderbox": myusevars.extend(self.settings["tinderbox/use"]) + myf.write('USE="'+string.join(myusevars)+'"\n') elif self.settings["target"]=="livecd-stage1": myusevars.extend(self.settings["livecd/use"]) + myf.write('USE="'+string.join(myusevars)+'"\n') elif self.settings["target"]=="embedded": myusevars.extend(self.settings["embedded/use"]) myf.write('USE="'+string.join(myusevars)+'"\n') @@ -619,8 +622,8 @@ class embedded_target(generic_stage_target): for x in range(0,len(myunmerge)): myunmerge[x]="'"+myunmerge[x]+"'" - myunmerge=string.join(myunmerge) - # before cleaning unmerge stuff + myunmerge=string.join(myunmerge) + # before cleaning unmerge stuff cmd("/bin/bash "+self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/unmerge.sh "+myunmerge,"unmerge script failed.") def clean(self): -- 2.26.2