From: Eric Edgar Date: Mon, 7 Nov 2005 19:46:04 +0000 (+0000) Subject: Fix broken aliases code that was just proof of concept X-Git-Tag: CATALYST_2_0_6_916~615 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44fe7d0cdf1bbdb58ee546b3e76cde3c5704b044;p=catalyst.git Fix broken aliases code that was just proof of concept git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@879 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index c8b85fd2..04288d38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.369 2005/11/07 19:34:20 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.370 2005/11/07 19:46:04 rocket Exp $ + + 07 Nov 2005; Eric Edgar + modules/generic_stage_target.py: + Fix broken aliases code that was just proof of concept 07 Nov 2005; Eric Edgar targets/support/create-iso.sh: Output mkisofs command line options to assist in debugging diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 1fdb7c43..74b52216 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.72 2005/11/07 18:58:06 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.73 2005/11/07 19:46:04 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -412,20 +412,6 @@ class generic_stage_target(generic_target): self.required_values.append("boot/kernel/"+x+"/sources") self.required_values.append("boot/kernel/"+x+"/config") self.valid_values.append("boot/kernel/"+x+"/aliases") - if type(self.settings["boot/kernel/"+x+"/aliases"]) == types.StringType: - aliases=[self.settings["boot/kernel/"+x+"/aliases"]] - else: - aliases=self.settings["boot/kernel/"+x+"/aliases"] - - self.valid_values.append("boot/kernel/"+x+"/console-types") - if type(self.settings["boot/kernel/"+x+"/console-types"]) == types.StringType: - consoles=[self.settings["boot/kernel/"+x+"/console-types"]] - - else: - consoles=self.settings["boot/kernel/"+x+"/console-types"] - #19:49 boot/kernel/pseries/console-types: none serial hvc hvsi - #19:49 boot/kernel/pseries/console/serial: ttyS0,9600 - self.valid_values.append("boot/kernel/"+x+"/extraversion") self.valid_values.append("boot/kernel/"+x+"/packages") self.valid_values.append("boot/kernel/"+x+"/use")