From ab12f244612f3e00ebf1d241b022b555416632ad Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 22 Jun 2006 14:54:27 +0000 Subject: [PATCH] Fix a problem where catalyst was creating an initial list, then putting that list inside another. Thanks to Andrew Gaffney for pointing it out and for the fix. This is for bug #136351. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1153 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 +++++++- modules/generic_stage_target.py | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef62c579..ddc60d06 100644 --- 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 + 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 for + pointing it out and for the fix. This is for bug #136351. 22 Jun 2006; Chris Gianelloni targets/support/unmerge.sh: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index a1c9ce75..5c6fbd0e 100644 --- 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) -- 2.26.2