From 694ed46c6df02721b23c5954b0e3f60364a4d350 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 27 Dec 2006 20:13:02 +0000 Subject: [PATCH] Fix indentation so things actually work. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1203 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 4 ++++ modules/generic_stage_target.py | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 153b0d2b..7f6a10aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.664 2006/10/02 20:41:53 wolf31o2 Exp $ + 27 Dec 2006; Chris Gianelloni + modules/generic_stage_target.py: + Fix indentation so things actually work. + 27 Dec 2006; Chris Gianelloni arch/sparc.py: Added patch from Mike Frysinger to change the SPARC personality check. diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 147b0824..3ec1bea0 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -936,11 +936,11 @@ class generic_stage_target(generic_target): cmd("rm -rf "+self.settings["destpath"]+x,"Couldn't clean "+x,env=self.env) # put /etc/hosts back into place - if os.path.exists(self.settings["chroot_path"]+"/etc/hosts.bck"): + if os.path.exists(self.settings["chroot_path"]+"/etc/hosts.bck"): cmd("mv -f "+self.settings["chroot_path"]+"/etc/hosts.bck "+self.settings["chroot_path"]+"/etc/hosts", "Could not replace /etc/hosts",env=self.env) - # remove our overlay - if os.path.exists(self.settings["chroot_path"]+"/usr/local/portage"): + # remove our overlay + if os.path.exists(self.settings["chroot_path"]+"/usr/local/portage"): cmd("rm -rf "+self.settings["chroot_path"]+"/usr/local/portage", "Could not remove /usr/local/portage",env=self.env) cmd("sed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+"/etc/make.conf", "Could not remove PORTDIR_OVERLAY from make.conf",env=self.env) -- 2.26.2