diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-07-12 23:31:55 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-07-12 23:31:55 +0000 |
| commit | 1749bb0211e97c07b12a0403cbb31dfb34b8799e (patch) | |
| tree | cdf7b1e5b81453240e3bf5fe8dd6b0ae9654a2bc | |
| parent | Removed postconf stuff from kmerge.sh, since it is gone from genkernel. This... (diff) | |
| download | gentoo-1749bb0211e97c07b12a0403cbb31dfb34b8799e.tar.gz gentoo-1749bb0211e97c07b12a0403cbb31dfb34b8799e.tar.bz2 gentoo-1749bb0211e97c07b12a0403cbb31dfb34b8799e.zip | |
Fixing fatal error in new postconf deprecation patch.
| -rw-r--r-- | src/catalyst/ChangeLog | 6 | ||||
| -rw-r--r-- | src/catalyst/modules/livecd_stage2_target.py | 22 |
2 files changed, 16 insertions, 12 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index 8d69eb34b3..9878cac19a 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.99 2005/07/12 21:34:20 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.100 2005/07/12 23:31:55 wolf31o2 Exp $ + + 12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> + modules/livecd_stage2_target.py: + Fixing fatal error in new postconf deprecation patch. 12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, livecd/runscript-support/kmerge.sh: diff --git a/src/catalyst/modules/livecd_stage2_target.py b/src/catalyst/modules/livecd_stage2_target.py index 3725237984..9ce757aae3 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.7 2005/07/12 21:00:08 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/livecd_stage2_target.py,v 1.30.2.8 2005/07/12 23:31:55 wolf31o2 Exp $ """ Builder class for a LiveCD stage2 build. @@ -249,23 +249,23 @@ 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"]] + if self.settings.has_key("boot/kernel/"+kname+"/postconf"): + print "boot/kernel/"+kname+"/postconf is deprecated" + print "\tInternally moving these ebuilds to boot/kernel/"+kname+"/packages" + print "\tPlease move them to boot/kernel/"+kname+"/packages in your spec file" + if type(self.settings["boot/kernel/"+kname+"/postconf"]) == types.StringType: + loop2=[self.settings["boot/kernel/"+kname+"/postconf"]] else: - loop2=self.settings["boot/kernel/"+x+"/postconf"] + loop2=self.settings["boot/kernel/"+kname+"/postconf"] for y in loop2: - self.settings["boot/kernel/"+x+"/packages"].append(y) + self.settings["boot/kernel/"+kname+"/packages"].append(y) - del self.settings["boot/kernel/"+x+"/postconf"] + del self.settings["boot/kernel/"+kname+"/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"]: + for extra in ["use","packages","gk_kernargs"]: if self.settings.has_key("boot/kernel/"+kname+"/"+extra): myex=self.settings["boot/kernel/"+kname+"/"+extra] if type(myex)==types.ListType: |