Add catalyst.spawn import where needed and move more spawn-related stuff from catalys...

diff --git a/ChangeLog b/ChangeLog
index a0ff5b87212ea86a318bf04af423646014ee8ea6..702dac8617cdcf1b41559594e3a44783b2c7e732 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/spawn.py, modules/catalyst/support.py,
+  modules/catalyst/target/generic_stage.py, modules/catalyst/target/grp.py,
+  modules/catalyst/target/livecd_stage1.py,
+  modules/catalyst/target/livecd_stage2.py,
+  modules/catalyst/target/netboot.py, modules/catalyst/target/netboot2.py,
+  modules/catalyst/target/snapshot.py, modules/catalyst/target/tinderbox.py:
+  Add catalyst.spawn import where needed and move more spawn-related stuff
+  from catalyst.support to catalyst.spawn
+
   11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst,
   modules/catalyst/arch/powerpc.py, modules/catalyst/arch/sparc.py,
   modules/catalyst/arch/x86.py, modules/catalyst/config.py,

diff --git a/modules/catalyst/spawn.py b/modules/catalyst/spawn.py
index 9e4a2e91bf1012e680df497cf4ed364dbf85ef7a..bfd76612fa23339b0c07d247bbb0265631393d93 100644 (file)
--- a/modules/catalyst/spawn.py
+++ b/modules/catalyst/spawn.py
@@ -6,6 +6,21 @@ import sys, os, types
 import catalyst.util
 from catalyst.error import *
 
+BASH_BINARY = "/bin/bash"
+
+selinux_capable = False
+#userpriv_capable = (os.getuid() == 0)
+#fakeroot_capable = False
+
+try:
+       import resource
+       max_fd_limit=resource.getrlimit(RLIMIT_NOFILE)
+except SystemExit, e:
+       raise
+except:
+       # hokay, no resource module.
+       max_fd_limit=256
+
 # XXX We need to change this to a singleton class to track it all properly
 # pids this process knows of.
 spawned_pids = []

diff --git a/modules/catalyst/support.py b/modules/catalyst/support.py
index 35d0bb6d101caf09e00ed854e790c19801ed994d..84bb5043932eef2ed8d24a1b16afc61950f9842e 100644 (file)
--- a/modules/catalyst/support.py
+++ b/modules/catalyst/support.py
@@ -4,20 +4,6 @@ from catalyst.output import warn
 import catalyst.util
 from catalyst.error import *
 
-selinux_capable = False
-#userpriv_capable = (os.getuid() == 0)
-#fakeroot_capable = False
-BASH_BINARY             = "/bin/bash"
-
-try:
-       import resource
-       max_fd_limit=resource.getrlimit(RLIMIT_NOFILE)
-except SystemExit, e:
-       raise
-except:
-       # hokay, no resource module.
-       max_fd_limit=256
-
 required_config_file_values=["storedir","sharedir","distdir","portdir"]
 valid_config_file_values=required_config_file_values[:]
 valid_config_file_values.append("PKGCACHE")

diff --git a/modules/catalyst/target/generic_stage.py b/modules/catalyst/target/generic_stage.py
index aa90dd02905ad970568e14fd4dc3d6ea9797e6e9..1b1f2dd5ebeb4405393de927ed0ade0ee084d17c 100644 (file)
--- a/modules/catalyst/target/generic_stage.py
+++ b/modules/catalyst/target/generic_stage.py
@@ -14,6 +14,7 @@ from catalyst.output import warn
 import catalyst.util
 import catalyst.hash
 from catalyst.error import *
+from catalyst.spawn import *
 
 class generic_stage_target(generic_target):
 

diff --git a/modules/catalyst/target/grp.py b/modules/catalyst/target/grp.py
index a98bff9ead409c0237e74f2727f09c92640ebcd7..6cf15d10d004129794370523688fa23e2647cc2c 100644 (file)
--- a/modules/catalyst/target/grp.py
+++ b/modules/catalyst/target/grp.py
@@ -8,6 +8,7 @@ from catalyst.support import *
 from generic_stage import *
 import catalyst.util
 from catalyst.error import *
+from catalyst.spawn import *
 
 class grp_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/livecd_stage1.py b/modules/catalyst/target/livecd_stage1.py
index f7e81b97ab8d99dd593bef18ec6a54fe7c63cce7..65d73b979a195b2553cd54c335c82d4eba1ea26a 100644 (file)
--- a/modules/catalyst/target/livecd_stage1.py
+++ b/modules/catalyst/target/livecd_stage1.py
@@ -6,6 +6,7 @@ Builder class for LiveCD stage1.
 from catalyst.support import *
 from generic_stage import *
 import catalyst.util
+from catalyst.spawn import *
 
 class livecd_stage1_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/livecd_stage2.py b/modules/catalyst/target/livecd_stage2.py
index 74c865fc4895b5186a87cd80f52ca0c697d32115..de47f31acd54f5eeffc0296f31348e63d0a938f5 100644 (file)
--- a/modules/catalyst/target/livecd_stage2.py
+++ b/modules/catalyst/target/livecd_stage2.py
@@ -9,6 +9,7 @@ from generic_stage import *
 import catalyst.util
 import catalyst.hash
 from catalyst.error import *
+from catalyst.spawn import *
 
 class livecd_stage2_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/netboot.py b/modules/catalyst/target/netboot.py
index 970f70635726a22818b1b3425bd3507e04e70a07..6bbca71efe899df4606816541b880ad4116042b4 100644 (file)
--- a/modules/catalyst/target/netboot.py
+++ b/modules/catalyst/target/netboot.py
@@ -8,6 +8,7 @@ from catalyst.support import *
 from generic_stage import *
 import catalyst.util
 from catalyst.error import *
+from catalyst.spawn import *
 
 class netboot_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/netboot2.py b/modules/catalyst/target/netboot2.py
index eaaf34595933de73689471579f0c4606bd1ca771..bf8e939062d65f7e03791ad296f4c9d71326c9a7 100644 (file)
--- a/modules/catalyst/target/netboot2.py
+++ b/modules/catalyst/target/netboot2.py
@@ -8,6 +8,7 @@ from catalyst.support import *
 from generic_stage import *
 import catalyst.util
 from catalyst.error import *
+from catalyst.spawn import *
 
 class netboot2_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/snapshot.py b/modules/catalyst/target/snapshot.py
index d46963c2a6ff10c3265026149ffd5e64cb6b6156..b5de4d55c07759bd6cd7210d22cf92ea4119e294 100644 (file)
--- a/modules/catalyst/target/snapshot.py
+++ b/modules/catalyst/target/snapshot.py
@@ -7,6 +7,7 @@ import os
 from catalyst.support import *
 from generic_stage import *
 import catalyst.util
+from catalyst.spawn import *
 
 class snapshot_target(generic_stage_target):
        def __init__(self,myspec,addlargs):

diff --git a/modules/catalyst/target/tinderbox.py b/modules/catalyst/target/tinderbox.py
index 0dbe0a82c0024204a6addcfc2d614c4b70f2b110..0eb29737520c396070b9501c382482e5cbaeb982 100644 (file)
--- a/modules/catalyst/target/tinderbox.py
+++ b/modules/catalyst/target/tinderbox.py
@@ -7,6 +7,7 @@ from catalyst.support import *
 from generic_stage import *
 import catalyst.util
 from catalyst.error import *
+from catalyst.spawn import *
 
 class tinderbox_target(generic_stage_target):
        def __init__(self,spec,addlargs):