self.env should be a part of the super class generic_target so it applies to snapshot...

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

diff --git a/ChangeLog b/ChangeLog
index 66c18258f9d459181267a9fcf783cb7c4efdd0e9..f2832edf68173852c81f1bfdd352e7fa9a049860 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.429 2005/12/07 17:27:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.430 2005/12/07 21:01:35 rocket Exp $
+
+  07 Dec 2005; Eric Edgar <rocket@gentoo.org>
+  modules/generic_stage_target.py, modules/generic_target.py:
+  self.env should be a part of the super class generic_target so it applies to
+  snapshots as well; removing redundant pass in the generic_target class as
+  its not needed. There is code there to fill the statements
 
   07 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index a1324b821aeecabb54299fc082a9fbe162721e50..c7b59ba4d52581d597c453865b2efde8e2eccc70 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.90 2005/12/07 07:11:44 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.91 2005/12/07 21:01:35 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -76,7 +76,6 @@ class generic_stage_target(generic_target):
                self.settings["hostarch"]=machinemap[mymachine]
                self.archmap={}
                self.subarchmap={}
-               self.env={}
                
                for x in targetmap[self.settings["hostarch"]]:
                        try:

diff --git a/modules/generic_target.py b/modules/generic_target.py
index d371346074496e0e13c3099fb46294a811a4cf74..b9e3213530a3bba56b151e6562f58dca832fc008 100644 (file)
--- a/modules/generic_target.py
+++ b/modules/generic_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_target.py,v 1.4 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_target.py,v 1.5 2005/12/07 21:01:35 rocket Exp $
 
 """
 The toplevel class for generic_stage_target. This is about as generic as we get.
@@ -13,4 +13,4 @@ class generic_target:
        def __init__(self,myspec,addlargs):
                addl_arg_parse(myspec,addlargs,self.required_values,self.valid_values)
                self.settings=myspec
-               pass
+               self.env={}