Fix a problem where catalyst was creating an initial list, then putting that list...

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

diff --git a/ChangeLog b/ChangeLog
index ef62c5791ef0e6f42e216ef207c99595e4fe7eee..ddc60d06d7153b5e91d5f0ff1b6a12c9e4f61292 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.637 2006/06/22 11:43:34 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.638 2006/06/22 14:54:27 wolf31o2 Exp $
+
+  22 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  modules/generic_stage_target.py:
+  Fix a problem where catalyst was creating an initial list, then putting that
+  list inside another. Thanks to Andrew Gaffney <agaffney@gentoo.org> for
+  pointing it out and for the fix. This is for bug #136351.
 
   22 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/unmerge.sh:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index a1c9ce757fafece33cb6e89e4ed5addba1c8341d..5c6fbd0eda2c762f38dcb380165ee0e4a084bc95 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_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/generic_stage_target.py,v 1.135 2006/06/08 21:27:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.136 2006/06/22 14:54:27 wolf31o2 Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -510,7 +510,7 @@ class generic_stage_target(generic_target):
                                
                                        for y in loop2:
                                                if not addlargs.has_key("boot/kernel/"+x+"/packages"):
-                                                       addlargs["boot/kernel/"+x+"/packages"]=[[y]]
+                                                       addlargs["boot/kernel/"+x+"/packages"]=[y]
                                                else:
                                                        addlargs["boot/kernel/"+x+"/packages"].append(y)