diff options
| author |   Eric Edgar <rocket@gentoo.org> | 2005-07-19 21:26:29 +0000 |
|---|---|---|
| committer | Eric Edgar <rocket@gentoo.org> | 2005-07-19 21:26:29 +0000 |
| commit | 623114f24738b60753af5fa79ff067d712d2970e (patch) | |
| tree | 27dd651c7e15e6eec4ac8daf0fd80ab0df9b3ec1 | |
| parent | Typo fix and changing example for portdir_overlay. (diff) | |
| download | gentoo-623114f24738b60753af5fa79ff067d712d2970e.tar.gz gentoo-623114f24738b60753af5fa79ff067d712d2970e.tar.bz2 gentoo-623114f24738b60753af5fa79ff067d712d2970e.zip | |
Allow grp to build without grp/use flag set
| -rw-r--r-- | src/catalyst/ChangeLog | 5 | ||||
| -rw-r--r-- | src/catalyst/modules/grp_target.py | 16 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index 53463534b9..004d051231 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/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/Attic/ChangeLog,v 1.198.2.111 2005/07/19 13:34:21 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.112 2005/07/19 21:26:29 rocket Exp $ + + 19 Jul 2005; Eric Edgar <rocket@gentoo.org> modules/grp_target.py: + Allow grp to build without grp/use flag set 19 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> examples/snapshot_template.spec: diff --git a/src/catalyst/modules/grp_target.py b/src/catalyst/modules/grp_target.py index ff513cda3b..0324d66fb5 100644 --- a/src/catalyst/modules/grp_target.py +++ b/src/catalyst/modules/grp_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/Attic/grp_target.py,v 1.6.2.3 2005/07/07 19:57:28 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/grp_target.py,v 1.6.2.4 2005/07/19 21:26:29 rocket Exp $ """ The builder class for GRP (Gentoo Reference Platform) builds. @@ -19,12 +19,13 @@ class grp_target(generic_stage_target): if not addlargs.has_key("grp"): raise CatalystError,"Required value \"grp\" not specified in spec." - self.required_values.extend(["grp","grp/use"]) + self.required_values.extend(["grp"]) if type(addlargs["grp"])==types.StringType: addlargs["grp"]=[addlargs["grp"]] - if type(addlargs["grp/use"])==types.StringType: - addlargs["grp/use"]=[addlargs["grp/use"]] + if addlargs.has_key("grp/use"): + 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") @@ -53,8 +54,11 @@ class grp_target(generic_stage_target): "setup_environment","run_local","unbind"] def set_use(self): - self.settings["use"]=self.settings["grp/use"] - self.settings["use"].append("bindist") + if self.settings.has_key("grp/use"): + self.settings["use"]=self.settings["grp/use"] + self.settings["use"].append("bindist") + else: + self.settings["use"]=["bindist"] def set_mounts(self): self.mounts.append("/tmp/grp") |