Grab just the first value return from the now-working call to resource.getrlimit()

diff --git a/ChangeLog b/ChangeLog
index 47f088e81981e5d0368d0d23416bad2f90d592ad..edb61f56991d7f9c8c5478edacf501bbeb1a8f88 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
 
+  12 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst,
+  modules/catalyst/__init__.py, modules/catalyst/spawn.py:
+  Grab just the first value return from the now-working call to
+  resource.getrlimit()
+
   12 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
   -examples/netboot_template.spec, -modules/catalyst/target/netboot.py,
   -targets/netboot/netboot-chroot.sh, -targets/netboot/netboot-combine.sh,

diff --git a/catalyst b/catalyst
index 35da3446915eda0973b49a6552e94d3079ea1e29..1cbb9f5d0d21ce5ae778882788b2e42f82df13e3 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -11,9 +11,7 @@ import os, sys, getopt
 __selfpath__ = os.path.abspath(os.path.dirname(__file__))
 sys.path.append(__selfpath__ + "/modules")
 
-import catalyst.config
-import catalyst.util
-import catalyst.target
+import catalyst
 from catalyst.output import *
 from catalyst.error import *
 from catalyst.hash import hash_map

diff --git a/modules/catalyst/__init__.py b/modules/catalyst/__init__.py
index ec0b62d87d7390f8d4a3fac41eddef128ebab0fe..a7d2aaff40926dba8da6535d819649d7f8575b11 100644 (file)
--- a/modules/catalyst/__init__.py
+++ b/modules/catalyst/__init__.py
@@ -5,6 +5,7 @@ import catalyst.util
 import catalyst.error
 import catalyst.spawn
 import catalyst.target
+import catalyst.config
 
 hash = catalyst.hash
 arch = catalyst.arch
@@ -13,3 +14,4 @@ util = catalyst.util
 error = catalyst.error
 spawn = catalyst.spawn
 target = catalyst.target
+config = catalyst.config

diff --git a/modules/catalyst/spawn.py b/modules/catalyst/spawn.py
index 7f26cd7dbb7341d2f67c76c3bf0d72a6452e9672..c173468227dc0e3e910bbae642d9e472fabdc592 100644 (file)
--- a/modules/catalyst/spawn.py
+++ b/modules/catalyst/spawn.py
@@ -14,7 +14,7 @@ selinux_capable = False
 
 try:
        import resource
-       max_fd_limit=resource.getrlimit(resource.RLIMIT_NOFILE)
+       max_fd_limit = resource.getrlimit(resource.RLIMIT_NOFILE)[0]
 except SystemExit, e:
        raise
 except: