diff options
| author |   Eric Edgar <rocket@gentoo.org> | 2005-07-12 21:00:08 +0000 |
|---|---|---|
| committer | Eric Edgar <rocket@gentoo.org> | 2005-07-12 21:00:08 +0000 |
| commit | 9b1432ae7d6c6a5449de89e608cb678cd76006e9 (patch) | |
| tree | 33b7c7b4affba94cfe22a17572ea0bd518611e3e | |
| parent | Fix catalyst to transparently handle the postconf deprecation in genkernel (diff) | |
| download | gentoo-9b1432ae7d6c6a5449de89e608cb678cd76006e9.tar.gz gentoo-9b1432ae7d6c6a5449de89e608cb678cd76006e9.tar.bz2 gentoo-9b1432ae7d6c6a5449de89e608cb678cd76006e9.zip | |
Fix backport of postconf fix
| -rw-r--r-- | src/catalyst/ChangeLog | 6 | ||||
| -rw-r--r-- | src/catalyst/modules/livecd_stage2_target.py | 30 |
2 files changed, 21 insertions, 15 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index 1c2ec8b472..f4cb695bea 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/ChangeLog @@ -1,6 +1,10 @@ # 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.96 2005/07/12 20:45:06 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.97 2005/07/12 21:00:08 rocket Exp $ + + 12 Jul 2005; Eric Edgar <rocket@gentoo.org> + modules/livecd_stage2_target.py: + Fix backport of postconf fix 12 Jul 2005; Eric Edgar <rocket@gentoo.org> modules/livecd_stage2_target.py: diff --git a/src/catalyst/modules/livecd_stage2_target.py b/src/catalyst/modules/livecd_stage2_target.py index 6b1de30c96..3725237984 100644 --- a/src/catalyst/modules/livecd_stage2_target.py +++ b/src/catalyst/modules/livecd_stage2_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/livecd_stage2_target.py,v 1.30.2.6 2005/07/12 20:45:06 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/livecd_stage2_target.py,v 1.30.2.7 2005/07/12 21:00:08 rocket Exp $ """ Builder class for a LiveCD stage2 build. @@ -32,19 +32,7 @@ class livecd_stage2_target(generic_stage_target): self.valid_values.append("boot/kernel/"+x+"/packages") self.valid_values.append("boot/kernel/"+x+"/use") self.valid_values.append("boot/kernel/"+x+"/gk_kernargs") - if self.settings.has_key("boot/kernel/"+x+"/postconf"): - print "boot/kernel/"+x+"/postconf is deprecated" - print "\tInternally moving these ebuilds to boot/kernel/"+x+"/packages" - print "\tPlease move them to boot/kernel/"+x+"/packages in your specfile" - if type(self.settings["boot/kernel/"+x+"/postconf"]) == types.StringType: - loop2=[self.settings["boot/kernel/"+x+"/postconf"]] - else: - loop2=self.settings["boot/kernel/"+x+"/postconf"] - - for y in loop2: - self.settings["boot/kernel/"+x+"/packages"].append(y) - - del self.settings["boot/kernel/"+x+"/postconf"] + self.valid_values.append("boot/kernel/"+x+"/postconf") self.valid_values.extend(self.required_values) self.valid_values.extend(["livecd/cdtar","livecd/empty","livecd/rm",\ @@ -261,6 +249,20 @@ class livecd_stage2_target(generic_stage_target): # should be skipped args.append("NULL_VALUE") + if self.settings.has_key("boot/kernel/"+x+"/postconf"): + print "boot/kernel/"+x+"/postconf is deprecated" + print "\tInternally moving these ebuilds to boot/kernel/"+x+"/packages" + print "\tPlease move them to boot/kernel/"+x+"/packages in your specfile" + if type(self.settings["boot/kernel/"+x+"/postconf"]) == types.StringType: + loop2=[self.settings["boot/kernel/"+x+"/postconf"]] + else: + loop2=self.settings["boot/kernel/"+x+"/postconf"] + + for y in loop2: + self.settings["boot/kernel/"+x+"/packages"].append(y) + + del self.settings["boot/kernel/"+x+"/postconf"] + # write out /var/tmp/kname.(use|packages) files, used for kernel USE # and extra packages settings for extra in ["use","packages","postconf","gk_kernargs"]: |