From 220a786087020504d26424a5643f0450f0587cd9 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Sun, 29 Jan 2006 18:58:03 +0000 Subject: [PATCH] space cleanups contributed from `Kumba git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1056 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++- modules/stage1_target.py | 48 +++++++++++++---------------- modules/stage2_target.py | 65 ++++++++++++++++++---------------------- 3 files changed, 54 insertions(+), 65 deletions(-) diff --git a/ChangeLog b/ChangeLog index 677d4e96..e8fd1390 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.541 2006/01/29 14:42:17 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.542 2006/01/29 18:58:03 rocket Exp $ + + 29 Jan 2006; Eric Edgar modules/stage1_target.py, + modules/stage2_target.py: + space cleanups contributed from `Kumba 29 Jan 2006; Eric Edgar modules/grp_target.py: add grp/use to valid_values in the grp module diff --git a/modules/stage1_target.py b/modules/stage1_target.py index 873daf0e..e68990a4 100644 --- a/modules/stage1_target.py +++ b/modules/stage1_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/stage1_target.py,v 1.22 2005/12/28 16:58:43 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage1_target.py,v 1.23 2006/01/29 18:58:03 rocket Exp $ """ Builder class for a stage1 installation tarball build. @@ -35,37 +35,29 @@ class stage1_target(generic_stage_target): "/usr/lib/python2.4/email", "/usr/lib/python2.4/lib-tk",\ "/usr/share/zoneinfo"]) - def override_chost(self): - #if os.environ.has_key("CHOST"): - # self.settings["CHOST"] = os.environ["CHOST"] - if self.settings.has_key("chost"): - self.settings["CHOST"]=list_to_string(self.settings["chost"]) + def override_chost(self): + if self.settings.has_key("chost"): + self.settings["CHOST"]=list_to_string(self.settings["chost"]) - def override_cflags(self): - #if os.environ.has_key("CFLAGS"): - # self.settings["CFLAGS"] = os.environ["CFLAGS"] - if self.settings.has_key("cflags"): - self.settings["CFLAGS"]=list_to_string(self.settings["cflags"]) + def override_cflags(self): + if self.settings.has_key("cflags"): + self.settings["CFLAGS"]=list_to_string(self.settings["cflags"]) - def override_cxxflags(self): - #if os.environ.has_key("CXXFLAGS"): - # self.settings["CXXFLAGS"] = os.environ["CXXFLAGS"] - if self.settings.has_key("cxxflags"): - self.settings["CXXFLAGS"]=list_to_string(self.settings["cxxflags"]) + def override_cxxflags(self): + if self.settings.has_key("cxxflags"): + self.settings["CXXFLAGS"]=list_to_string(self.settings["cxxflags"]) - def override_ldflags(self): - #if os.environ.has_key("LDFLAGS"): - # self.settings["LDFLAGS"] = os.environ["LDFLAGS"] - if self.settings.has_key("ldflags"): - self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"]) + def override_ldflags(self): + if self.settings.has_key("ldflags"): + self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"]) - def set_portage_overlay(self): - generic_stage_target.set_portage_overlay(self) - if self.settings.has_key("portage_overlay"): - print "\nWARNING !!!!!" - print "\tUsing an portage overlay for earlier stages could cause build issues." - print "\tIf you break it, you buy it. Don't complain to us about it." - print "\tDont say we did not warn you\n" + def set_portage_overlay(self): + generic_stage_target.set_portage_overlay(self) + if self.settings.has_key("portage_overlay"): + print "\nWARNING !!!!!" + print "\tUsing an portage overlay for earlier stages could cause build issues." + print "\tIf you break it, you buy it. Don't complain to us about it." + print "\tDont say we did not warn you\n" def register(foo): foo.update({"stage1":stage1_target}) diff --git a/modules/stage2_target.py b/modules/stage2_target.py index e33e8dd4..b9fddc87 100644 --- a/modules/stage2_target.py +++ b/modules/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/stage2_target.py,v 1.12 2005/12/20 20:53:49 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage2_target.py,v 1.13 2006/01/29 18:58:03 rocket Exp $ """ Builder class for a stage2 installation tarball build. @@ -15,48 +15,41 @@ class stage2_target(generic_stage_target): self.valid_values=[] generic_stage_target.__init__(self,spec,addlargs) def set_root_path(self): - # ROOT= variable for emerges - self.settings["root_path"]=normpath("/tmp/stage1root") + # ROOT= variable for emerges + self.settings["root_path"]=normpath("/tmp/stage1root") - def set_source_path(self): - self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/"+self.settings["root_path"]+"/") + def set_source_path(self): + self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/"+self.settings["root_path"]+"/") - # reset the root path so the preclean doesnt fail - generic_stage_target.set_root_path(self) + # reset the root path so the preclean doesnt fail + generic_stage_target.set_root_path(self) - if os.path.isdir(self.settings["source_path"]): - print "\nUsing seed-stage from "+self.settings["source_path"] - print "Delete this folder if you wish to use a seed stage tarball instead\n" - else: - self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2") - if os.path.isfile(self.settings["source_path"]): - if os.path.exists(self.settings["source_path"]): - self.settings["source_path_hash"]=generate_hash(self.settings["source_path"]) - def override_chost(self): - #if os.environ.has_key("CHOST"): - # self.settings["CHOST"] = os.environ["CHOST"] - if self.settings.has_key("chost"): - self.settings["CHOST"]=list_to_string(self.settings["chost"]) + if os.path.isdir(self.settings["source_path"]): + print "\nUsing seed-stage from "+self.settings["source_path"] + print "Delete this folder if you wish to use a seed stage tarball instead\n" + else: + self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2") + if os.path.isfile(self.settings["source_path"]): + if os.path.exists(self.settings["source_path"]): + self.settings["source_path_hash"]=generate_hash(self.settings["source_path"]) - def override_cflags(self): - #if os.environ.has_key("CFLAGS"): - # self.settings["CFLAGS"] = os.environ["CFLAGS"] - if self.settings.has_key("cflags"): - self.settings["CFLAGS"]=list_to_string(self.settings["cflags"]) + def override_chost(self): + if self.settings.has_key("chost"): + self.settings["CHOST"]=list_to_string(self.settings["chost"]) - def override_cxxflags(self): - #if os.environ.has_key("CXXFLAGS"): - # self.settings["CXXFLAGS"] = os.environ["CXXFLAGS"] - if self.settings.has_key("cxxflags"): - self.settings["CXXFLAGS"]=list_to_string(self.settings["cxxflags"]) + def override_cflags(self): + if self.settings.has_key("cflags"): + self.settings["CFLAGS"]=list_to_string(self.settings["cflags"]) - def override_ldflags(self): - #if os.environ.has_key("LDFLAGS"): - # self.settings["LDFLAGS"] = os.environ["LDFLAGS"] - if self.settings.has_key("ldflags"): - self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"]) + def override_cxxflags(self): + if self.settings.has_key("cxxflags"): + self.settings["CXXFLAGS"]=list_to_string(self.settings["cxxflags"]) - def set_portage_overlay(self): + def override_ldflags(self): + if self.settings.has_key("ldflags"): + self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"]) + + def set_portage_overlay(self): generic_stage_target.set_portage_overlay(self) if self.settings.has_key("portage_overlay"): print "\nWARNING !!!!!" -- 2.26.2