From d3de071a8bab5e5f93299a32820d8a8deab2c050 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Mon, 30 Jan 2006 13:38:24 +0000 Subject: [PATCH] Additional spacing fixes submitted by `Kumba git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1057 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 ++++- modules/stage2_target.py | 18 +++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8fd1390..a399875c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.542 2006/01/29 18:58:03 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.543 2006/01/30 13:38:24 rocket Exp $ + + 30 Jan 2006; Eric Edgar modules/stage2_target.py: + Additional spacing fixes submitted by `Kumba 29 Jan 2006; Eric Edgar modules/stage1_target.py, modules/stage2_target.py: diff --git a/modules/stage2_target.py b/modules/stage2_target.py index b9fddc87..03c7728d 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.13 2006/01/29 18:58:03 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage2_target.py,v 1.14 2006/01/30 13:38:24 rocket Exp $ """ Builder class for a stage2 installation tarball build. @@ -24,14 +24,14 @@ class stage2_target(generic_stage_target): # 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"]) + 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 self.settings.has_key("chost"): -- 2.26.2