From: Eric Edgar Date: Fri, 27 Jan 2006 15:04:07 +0000 (+0000) Subject: Fix type error when kernel packages arent defined X-Git-Tag: CATALYST_2_0_6_916~444 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f34718073facb1f2a105434dea97c395de9adb55;p=catalyst.git Fix type error when kernel packages arent defined git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1050 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index e31baf62..d9b6f591 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.535 2006/01/27 14:45:21 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.536 2006/01/27 15:04:07 rocket Exp $ + + 27 Jan 2006; Eric Edgar + modules/generic_stage_target.py: + Fix type error when kernel packages arent defined 27 Jan 2006; Chris Gianelloni examples/generic_stage_template.spec, examples/grp_template.spec, diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index cf6631b7..6d232426 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.123 2006/01/26 19:56:32 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.124 2006/01/27 15:04:07 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -475,8 +475,9 @@ class generic_stage_target(generic_target): self.valid_values.append("boot/kernel/"+x+"/aliases") self.valid_values.append("boot/kernel/"+x+"/extraversion") self.valid_values.append("boot/kernel/"+x+"/packages") - if type(addlargs["boot/kernel/"+x+"/packages"]) == types.StringType: - addlargs["boot/kernel/"+x+"/packages"]=[addlargs["boot/kernel/"+x+"/packages"]] + if addlargs.has_key("boot/kernel/"+x+"/packages"): + if type(addlargs["boot/kernel/"+x+"/packages"]) == types.StringType: + addlargs["boot/kernel/"+x+"/packages"]=[addlargs["boot/kernel/"+x+"/packages"]] self.valid_values.append("boot/kernel/"+x+"/use") self.valid_values.append("boot/kernel/"+x+"/gk_kernargs") self.valid_values.append("boot/kernel/"+x+"/gk_action")