fixing the livecd-stage1 use situation

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@341 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index a33acf51c4390753f04179f5f179473fb8ad47fd..c126890ccea7d143975d47bdc0e23ecafebb7dc2 100644 (file)
--- 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 <zhen@gentoo.org> modules/targets.py:
+  use broken for grp, livecd-stage1, tinderbox, etc. fixed
 
   01 Apr 2004; John Davis <zhen@gentoo.org>
   livecd/runscript/default-runscript.sh:

diff --git a/modules/targets.py b/modules/targets.py
index 866da00a207379a3767b5fdead2de4695154e938..fc2cc306297ae162c9c94edd89a0ad8d57f99f6f 100644 (file)
--- 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):