From: Andrew Gaffney <agaffney@gentoo.org>
Date: Mon, 12 Jan 2009 00:11:58 +0000 (-0600)
Subject: Grab just the first value return from the now-working call to resource.getrlimit()
X-Git-Tag: CATALYST-2.0.10~3^2~188
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=61b47bf37e7174c0e29ae42049948ccc71648a25;p=catalyst.git

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

diff --git a/ChangeLog b/ChangeLog
index 47f088e8..edb61f56 100644
--- 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 35da3446..1cbb9f5d 100755
--- 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 ec0b62d8..a7d2aaff 100644
--- 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 7f26cd7d..c1734682 100644
--- 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: