From 083e8e00dcf2241eb963ad08e75fd6ff4804aaad Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Thu, 28 Apr 2005 13:46:48 +0000 Subject: [PATCH] print warning message about deprecated use of cdfstype git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@633 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- modules/generic_stage_target.py | 13 +++++++++---- modules/livecd_stage2_target.py | 6 +++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b823c16d..9bdfea86 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.245 2005/04/28 13:09:13 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.246 2005/04/28 13:46:48 rocket Exp $ + + 28 Apr 2005; Eric Edgar + modules/generic_stage_target.py, modules/livecd_stage2_target.py: + print warning message about deprecated use of cdfstype 28 Apr 2005; Eric Edgar targets/support/chroot-functions.sh: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 43fb55c8..510bce38 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.42 2005/04/27 21:31:05 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.43 2005/04/28 13:46:48 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -247,8 +247,11 @@ class generic_stage_target(generic_target): def set_fstype(self): if self.settings.has_key(self.settings["spec_prefix"]+"/cdfstype"): - print "\n\n\nWarning!!!"+self.settings["spec_prefix"]+"/cdfstype" + "is deprecated and may be removed." - print "\tUse "+self.settings["spec_prefix"]+"/fstype" + "instead.\n\n\n" + print "\nWarning!!! " + print self.settings["spec_prefix"]+"/cdfstype" + " is deprecated and may be removed." + print "\tUse "+self.settings["spec_prefix"]+"/fstype" + " instead." + print "\tConverting to "+self.settings["spec_prefix"]+"/fstype" + " internally." + print "\tContinuing ....\n" self.settings["fstype"]=self.settings[self.settings["spec_prefix"]+"/cdfstype"] del self.settings[self.settings["spec_prefix"]+"/cdfstype"] @@ -258,6 +261,9 @@ class generic_stage_target(generic_target): if not self.settings.has_key("fstype"): self.settings["fstype"]="normal" + for x in self.valid_values: + if x == self.settings["spec_prefix"]+"/fstype" or x == self.settings["spec_prefix"]+"/cdfstype": + print "\n"+self.settings["spec_prefix"]+"/fstype is being set to the default of \"normal\"\n" def set_fsops(self): if self.settings.has_key("fstype"): @@ -507,7 +513,6 @@ class generic_stage_target(generic_target): # copy over the portage overlays # Always copy over the overlay incase it has changed if self.settings.has_key("portage_overlay"): - print self.settings["portage_overlay"] if type(self.settings["portage_overlay"])==types.StringType: self.settings["portage_overlay"]=[self.settings["portage_overlay"]] diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index 89080369..c0d59074 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.38 2005/04/27 17:44:58 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.39 2005/04/28 13:46:48 rocket Exp $ """ Builder class for a LiveCD stage2 build. @@ -12,7 +12,7 @@ from generic_stage_target import * class livecd_stage2_target(generic_stage_target): def __init__(self,spec,addlargs): - self.required_values=["boot/kernel","livecd/fstype"] + self.required_values=["boot/kernel"] self.valid_values=[] @@ -22,7 +22,7 @@ class livecd_stage2_target(generic_stage_target): "livecd/motd","livecd/overlay","livecd/modblacklist","livecd/splash_theme",\ "livecd/rcadd","livecd/rcdel","livecd/fsscript","livecd/xinitrc",\ "livecd/root_overlay","livecd/devmanager","livecd/splash_type",\ - "gamecd/conf","livecd/users","portage_overlay"]) + "gamecd/conf","livecd/users","portage_overlay","livecd/cdfstype"]) generic_stage_target.__init__(self,spec,addlargs) -- 2.26.2