From: Andrew Gaffney Date: Sun, 29 Nov 2009 00:05:47 +0000 (-0600) Subject: Split up huge __init__() into startup and run-time init functions X-Git-Tag: CATALYST-2.0.10~3^2~83 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=55d74efccd8e91f51959ada4169bd5fcdeeb38fe;p=catalyst.git Split up huge __init__() into startup and run-time init functions --- diff --git a/ChangeLog b/ChangeLog index 75fcb31f..56306423 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ # Distributed under the GPL v2 # $Id$ + 29 Nov 2009; Andrew Gaffney + modules/catalyst/target/generic_stage.py: + Split up huge __init__() into startup and run-time init functions + 28 Nov 2009; Andrew Gaffney 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 543b255a..b7f299fb 100644 --- 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()