From: Eric Edgar Date: Mon, 18 Apr 2005 14:11:23 +0000 (+0000) Subject: Fix grp/use bug #89365 X-Git-Tag: CATALYST_2_0_6_916~773 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=35d4a056da3aa3712524b979a181595b45f322aa;p=catalyst.git Fix grp/use bug #89365 git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@607 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 3957a6ae..674bbbcc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.222 2005/04/15 16:49:45 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.223 2005/04/18 14:11:23 rocket Exp $ + + 18 Apr 2005; Eric Edgar modules/grp_target.py: + Fix grp/use bug #89365 15 Apr 2005; Eric Edgar modules/generic_stage_target.py, targets/support/kmerge.sh: diff --git a/modules/grp_target.py b/modules/grp_target.py index 1089cce9..4ec36ee4 100644 --- a/modules/grp_target.py +++ b/modules/grp_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/grp_target.py,v 1.8 2005/04/14 14:59:48 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/grp_target.py,v 1.9 2005/04/18 14:11:23 rocket Exp $ """ The builder class for GRP (Gentoo Reference Platform) builds. @@ -22,6 +22,9 @@ class grp_target(generic_stage_target): self.required_values.extend(["grp","grp/use"]) if type(addlargs["grp"])==types.StringType: addlargs["grp"]=[addlargs["grp"]] + + if type(addlargs["grp/use"])==types.StringType: + addlargs["grp/use"]=[addlargs["grp/use"]] for x in addlargs["grp"]: self.required_values.append("grp/"+x+"/packages")