Don't pass conf_values or addlargs to target __init__()

diff --git a/ChangeLog b/ChangeLog
index 167045945d321e1851cd2340b9b3bfbcc04de27f..caf3af02bec316f2dcba1d4e27787b38fe284aed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  13 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst,
+  modules/catalyst/target/generic_stage.py,
+  modules/catalyst/target/snapshot.py:
+  Don't pass conf_values or addlargs to target __init__()
+
   13 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/target/embedded.py, modules/catalyst/target/generic.py,
   modules/catalyst/target/generic_stage.py,

diff --git a/catalyst b/catalyst
index 50a7af7fd03416023d92ac1e7c0b70f6f89cb0bd..a959e91a9e3564cd1a49dcbfbfa0b957c3b4e5bf 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -147,7 +147,8 @@ def build_target(addlargs, targetmap):
                        raise CatalystError,"Target \""+addlargs["target"]+"\" not available."
 
                config.get_spec().set_target(addlargs["target"])
-               mytarget=targetmap[addlargs["target"]](conf_values, addlargs)
+#              mytarget=targetmap[addlargs["target"]](conf_values, addlargs)
+               mytarget=targetmap[addlargs["target"]]()
 
                mytarget.run()
 

diff --git a/modules/catalyst/target/generic_stage.py b/modules/catalyst/target/generic_stage.py
index dc7da5340f49dd57f17b63437ec96d7acc3abad4..b311bceacc042969ea48cd413383efd46bddc4bf 100644 (file)
--- a/modules/catalyst/target/generic_stage.py
+++ b/modules/catalyst/target/generic_stage.py
@@ -15,6 +15,8 @@ from catalyst.target.generic import *
 class generic_stage_target(generic_target):
 
        def __init__(self, myspec=None, addlargs=None):
+               generic_target.__init__(self,myspec,addlargs)
+
                self.required_values.extend(["version_stamp","target","subarch",\
                        "rel_type","profile","snapshot","source_subpath"])
 
@@ -24,7 +26,6 @@ class generic_stage_target(generic_target):
                        "distcc_hosts","makeopts","pkgcache_path","kerncache_path"])
 
                self.set_valid_build_kernel_vars(addlargs)
-               generic_target.__init__(self,myspec,addlargs)
 
                """
                The semantics of subarchmap and machinemap changed a bit in 2.0.3 to

diff --git a/modules/catalyst/target/snapshot.py b/modules/catalyst/target/snapshot.py
index b9ff0c85b467b2dfd3e801196d830d21c6d1f20b..5df1610d5c7ac62e37ed9784d75a29d184351b54 100644 (file)
--- a/modules/catalyst/target/snapshot.py
+++ b/modules/catalyst/target/snapshot.py
@@ -5,17 +5,18 @@ Builder class for snapshots.
 
 import os, shutil, stat
 import catalyst
+from catalyst.target.generic import generic_target
 from catalyst.spawn import cmd
 from catalyst.output import *
 
 class snapshot_target(catalyst.target.generic.generic_target):
 
-       def __init__(self,myspec,addlargs):
+       def __init__(self):
+               generic_target.__init__(self)
+
                self.required_values = ["version_stamp","target"]
                self.valid_values = ["version_stamp","target"]
 
-               catalyst.target.generic.generic_target.__init__(self)
-
        def setup(self):
                self.settings["target_subpath"]="portage"
                st=self.settings["storedir"]