From ee6f0caa081a92343aae7836b21325728cc8b273 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Wed, 2 Nov 2005 21:54:29 +0000 Subject: [PATCH] Make use spec key optional to default to profile defaults git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@872 d1e1f19c-881f-0410-ab34-b69fee027534 --- modules/embedded_target.py | 6 +++--- modules/livecd_stage1_target.py | 6 +++--- modules/tinderbox_target.py | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/embedded_target.py b/modules/embedded_target.py index bb5fd01c..6d7884d4 100644 --- a/modules/embedded_target.py +++ b/modules/embedded_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/embedded_target.py,v 1.14 2005/08/09 14:12:26 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/embedded_target.py,v 1.15 2005/11/02 21:54:29 rocket Exp $ """ This class works like a 'stage3'. A stage2 tarball is unpacked, but instead @@ -22,8 +22,8 @@ class embedded_target(generic_stage_target): def __init__(self,spec,addlargs): self.required_values=[] self.valid_values=[] - self.valid_values.extend(["embedded/empty","embedded/rm","embedded/unmerge","embedded/fs-prepare","embedded/fs-finish","embedded/mergeroot","embedded/packages","embedded/use","embedded/fs-type","embedded/runscript","boot/kernel"]) - + self.valid_values.extend(["embedded/empty","embedded/rm","embedded/unmerge","embedded/fs-prepare","embedded/fs-finish","embedded/mergeroot","embedded/packages","embedded/fs-type","embedded/runscript","boot/kernel"]) + self.valid_values.extend(["embedded/use"]) if addlargs.has_key("embedded/fs-type"): self.valid_values.append("embedded/fs-ops") diff --git a/modules/livecd_stage1_target.py b/modules/livecd_stage1_target.py index 05896cbf..5ad116b3 100644 --- a/modules/livecd_stage1_target.py +++ b/modules/livecd_stage1_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/livecd_stage1_target.py,v 1.16 2005/09/08 20:20:03 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage1_target.py,v 1.17 2005/11/02 21:54:29 rocket Exp $ """ Builder class for LiveCD stage1. @@ -11,11 +11,11 @@ from generic_stage_target import * class livecd_stage1_target(generic_stage_target): def __init__(self,spec,addlargs): - self.required_values=["livecd/packages","livecd/use"] + self.required_values=["livecd/packages"] self.valid_values=self.required_values[:] # Add optional livecd/type field for extra specific stuff - self.valid_values.extend(["livecd/type"]) + self.valid_values.extend(["livecd/type","livecd/use"]) generic_stage_target.__init__(self,spec,addlargs) def set_action_sequence(self): diff --git a/modules/tinderbox_target.py b/modules/tinderbox_target.py index 5975d23f..e19acec8 100644 --- a/modules/tinderbox_target.py +++ b/modules/tinderbox_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/tinderbox_target.py,v 1.12 2005/10/06 21:00:03 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/tinderbox_target.py,v 1.13 2005/11/02 21:54:29 rocket Exp $ """ builder class for the tinderbox target @@ -11,8 +11,9 @@ from generic_stage_target import * class tinderbox_target(generic_stage_target): def __init__(self,spec,addlargs): - self.required_values=["tinderbox/packages","tinderbox/use"] + self.required_values=["tinderbox/packages"] self.valid_values=self.required_values[:] + self.valid_values.extend(["tinderbox/use"]) generic_stage_target.__init__(self,spec,addlargs) def run_local(self): -- 2.26.2