remove extra self.env={} that was resetting the environment to null

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

diff --git a/ChangeLog b/ChangeLog
index f8baa476811fe1fc401133b2fb98536fb1c42dc4..746b490b845f398f4f631206333d6fefc71fde1e 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.438 2005/12/08 22:02:05 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.439 2005/12/08 22:23:31 rocket Exp $
+
+  08 Dec 2005; Eric Edgar <rocket@gentoo.org>
+  modules/generic_stage_target.py:
+  remove extra self.env={} that was resetting the environment to null
 
   08 Dec 2005; Eric Edgar <rocket@gentoo.org>
   modules/livecd_stage1_target.py:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 16f3b0573d93c18c88e4cc5d1c773f7b46eeee0e..e37150a47784a14fe6242058909dbd6fb3d65a6a 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.92 2005/12/08 15:16:48 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.93 2005/12/08 22:23:31 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -959,7 +959,6 @@ class generic_stage_target(generic_target):
        def setup_environment(self):
                # modify the current environment. This is an ugly hack that should be fixed. We need this
                # to use the os.system() call since we can't specify our own environ:
-               self.env={}
                for x in self.settings.keys():
                        # "/" is replaced with "_", "-" is also replaced with "_"
                        varname="clst_"+string.replace(x,"/","_")