Split up huge __init__() into startup and run-time init functions

diff --git a/ChangeLog b/ChangeLog
index 75fcb31f9f5fefb0a82a5c858e820e30805bae1b..56306423407086dfbfff9908f913aafe915743b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  29 Nov 2009; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/target/generic_stage.py:
+  Split up huge __init__() into startup and run-time init functions
+
   28 Nov 2009; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/target/__init__.py:
   Add initial target buildplan logic

diff --git a/modules/catalyst/target/generic_stage.py b/modules/catalyst/target/generic_stage.py
index 543b255af3c23fbeb6c623f554051a0cf04dd3e8..b7f299fb2ff858fa9eff7411f16b7709cf9d7801 100644 (file)
--- a/modules/catalyst/target/generic_stage.py
+++ b/modules/catalyst/target/generic_stage.py
@@ -82,6 +82,8 @@ class generic_stage_target(generic_target):
                self.settings["crosscompile"]=(self.settings["hostarch"]!=\
                        self.settings["buildarch"])
 
+       def run_init(self):
+
                """ Call arch constructor, pass our settings """
                try:
                        self.arch=self.subarchmap[self.settings["subarch"]](self.settings)
@@ -925,6 +927,8 @@ class generic_stage_target(generic_target):
        def run(self):
                self.chroot_lock.write_lock()
 
+               self.run_init()
+
                """ Kill any pids in the chroot "" """
                self.kill_chroot_pids()