Fixes for env

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@938 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 26f62de53aeda8e0c6a0f5bc01430f23f5cb1a9c..e463cdac3c2d4d01b766a4ba7bbe2030edcf10ac 100644 (file)
--- 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.425 2005/12/05 18:13:12 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.426 2005/12/05 19:24:48 rocket Exp $
+
+  05 Dec 2005; Eric Edgar <rocket@gentoo.org>
+  modules/generic_stage_target.py:
+  Fixes for env
 
   05 Dec 2005; Eric Edgar <rocket@gentoo.org> catalyst, files/catalyst.1,
   modules/catalyst_support.py, modules/generic_stage_target.py,

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index d12fb7cb446d46311b08f918d4959521c7b4f8c1..b72cacbcb1f8694479adffa7753a8c5a8a52170a 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_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/generic_stage_target.py,v 1.88 2005/12/05 18:13:12 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.89 2005/12/05 19:24:48 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -22,7 +22,7 @@ class generic_stage_target(generic_target):
                self.valid_values.extend(["version_stamp","target","subarch","rel_type","profile",\
                        "snapshot","source_subpath","portage_confdir","cflags","cxxflags","chost","hostuse"])
                generic_target.__init__(self,addlargs,myspec)
-               
+               self.env={}             
                # map the mainarch we are running under to the mainarches we support for
                # building stages and LiveCDs. (for example, on amd64, we can build stages for
                # x86 or amd64.
@@ -252,7 +252,7 @@ class generic_stage_target(generic_target):
                else:
                        # first clean up any existing target stuff
                        if os.path.isfile(self.settings["target_path"]):
-                               cmd("rm -f "+self.settings["target_path"],
+                               cmd("rm -f "+self.settings["target_path"],\
                                        "Could not remove existing file: "+self.settings["target_path"],env=self.env)
                                touch(self.settings["autoresume_path"]+"setup_target_path")