From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: [gentoo-catalyst] [PATCH 4/8] Fix undefined variable: RLIMIT_NOFILE
Date: Wed, 2 Apr 2014 13:29:39 -0700 [thread overview]
Message-ID: <1396470583-8756-4-git-send-email-dolsen@gentoo.org> (raw)
In-Reply-To: <1396470583-8756-2-git-send-email-dolsen@gentoo.org>
It was not imported from resource, it was also not used correctly.
---
catalyst/support.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/catalyst/support.py b/catalyst/support.py
index e25394e..5abf614 100644
--- a/catalyst/support.py
+++ b/catalyst/support.py
@@ -6,14 +6,16 @@ selinux_capable = False
#fakeroot_capable = False
BASH_BINARY = "/bin/bash"
+# set it to 0 for the soft limit, 1 for the hard limit
+DESIRED_RLIMIT = 0
try:
- import resource
- max_fd_limit=resource.getrlimit(RLIMIT_NOFILE)
+ import resource
+ max_fd_limit=resource.getrlimit(resource.RLIMIT_NOFILE)[DESIRED_RLIMIT]
except SystemExit, e:
- raise
+ raise
except:
- # hokay, no resource module.
- max_fd_limit=256
+ # hokay, no resource module.
+ max_fd_limit=256
# pids this process knows of.
spawned_pids = []
--
1.8.5.3
next prev parent reply other threads:[~2014-04-02 20:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-02 20:29 [gentoo-catalyst] [PATCH 2/8] Initial separation and creation of contents.py Brian Dolbec
2014-04-02 20:29 ` [gentoo-catalyst] [PATCH 3/8] main.py: print the output of an ImportError to help in debugging Brian Dolbec
2014-04-02 20:29 ` Brian Dolbec [this message]
2014-04-02 20:29 ` [gentoo-catalyst] [PATCH 5/8] Creation of a new defaults.py Brian Dolbec
2014-04-02 20:29 ` [gentoo-catalyst] [PATCH 6/8] Move generic_stage_targets.py constants to defaults.py Brian Dolbec
2014-04-02 20:29 ` [gentoo-catalyst] [PATCH 7/8] Move confdefaults out of main.py Brian Dolbec
2014-04-02 20:29 ` [gentoo-catalyst] [PATCH 8/8] livecdfs-update: No tmpfs on /lib/firmware Brian Dolbec
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1396470583-8756-4-git-send-email-dolsen@gentoo.org \
--to=dolsen@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox