Fix appending livecd use flag if no use flag is specified in livecd-stage1 spec file

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

diff --git a/ChangeLog b/ChangeLog
index 87461fccdc93eb977a0c2d8b0e4ffdfbf021cdbc..f8baa476811fe1fc401133b2fb98536fb1c42dc4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.437 2005/12/08 21:20:23 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.438 2005/12/08 22:02:05 rocket Exp $
+
+  08 Dec 2005; Eric Edgar <rocket@gentoo.org>
+  modules/livecd_stage1_target.py:
+  Fix appending livecd use flag if no use flag is specified in livecd-stage1
+  spec file
 
   08 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/generic_target.py:
   Add a default path to the environment in the chroot

diff --git a/modules/livecd_stage1_target.py b/modules/livecd_stage1_target.py
index 157575740c1005789a32f380df3bb56b687d4298..b45ded39f44a354e32ffe17f6e677c3953fe3df4 100644 (file)
--- a/modules/livecd_stage1_target.py
+++ b/modules/livecd_stage1_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage1_target.py,v 1.24 2005/12/05 18:13:12 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage1_target.py,v 1.25 2005/12/08 22:02:05 rocket Exp $
 
 """
 Builder class for LiveCD stage1.
@@ -45,8 +45,11 @@ class livecd_stage1_target(generic_stage_target):
                        self.settings["spec_prefix"]="livecd"
        
        def set_use(self):
-           generic_stage_target.set_use(self)
-           self.settings["use"].append("livecd")
+               generic_stage_target.set_use(self)
+               if self.settings.has_key("use"):
+                       self.settings["use"].append("livecd")
+               else:
+                       self.settings["use"]=["livecd"]
 
        def set_packages(self):
            generic_stage_target.set_packages(self)