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 3957a6ae5171c0990ab9ce620e510b3f7bac56d9..674bbbcc8785e458ab224c8852b2c56fe333e7ec 100644 (file)
--- 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 <rocket@gentoo.org> modules/grp_target.py:
+  Fix grp/use bug #89365
 
   15 Apr 2005; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py, targets/support/kmerge.sh:

diff --git a/modules/grp_target.py b/modules/grp_target.py
index 1089cce959ab9b27920bed06cee5755b49428342..4ec36ee40cd79b85e9f783240f42e8c41a778a27 100644 (file)
--- 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")