diff options
| author |   Eric Edgar <rocket@gentoo.org> | 2005-07-12 20:45:06 +0000 |
|---|---|---|
| committer | Eric Edgar <rocket@gentoo.org> | 2005-07-12 20:45:06 +0000 |
| commit | 741090f142725cb6ad800eabeb179d695bb32aa7 (patch) | |
| tree | 5ee39b14f23d39d5c63c51ac19e32800d1e33920 | |
| parent | Removing alsasound init script, as it is now started by autoconfig. (diff) | |
| download | gentoo-741090f142725cb6ad800eabeb179d695bb32aa7.tar.gz gentoo-741090f142725cb6ad800eabeb179d695bb32aa7.tar.bz2 gentoo-741090f142725cb6ad800eabeb179d695bb32aa7.zip | |
Fix catalyst to transparently handle the postconf deprecation in genkernel
| -rw-r--r-- | src/catalyst/ChangeLog | 6 | ||||
| -rw-r--r-- | src/catalyst/modules/livecd_stage2_target.py | 18 |
2 files changed, 20 insertions, 4 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index ca9ef72ebd..1c2ec8b472 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.95 2005/07/12 17:02:51 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.96 2005/07/12 20:45:06 rocket Exp $ + + 12 Jul 2005; Eric Edgar <rocket@gentoo.org> + modules/livecd_stage2_target.py: + Fix catalyst to transparently handle the postconf deprecation in genkernel 12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> livecd/runscript-support/livecdfs-update.sh: diff --git a/src/catalyst/modules/livecd_stage2_target.py b/src/catalyst/modules/livecd_stage2_target.py index 71a5a5139c..6b1de30c96 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.5 2005/07/05 21:47:46 wolf31o2 Exp $ +# $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 $ """ Builder class for a LiveCD stage2 build. @@ -32,8 +32,20 @@ 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") - self.valid_values.append("boot/kernel/"+x+"/postconf") - + 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.extend(self.required_values) self.valid_values.extend(["livecd/cdtar","livecd/empty","livecd/rm",\ "livecd/unmerge","livecd/iso","livecd/gk_mainargs","livecd/type",\ |