public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: [gentoo-catalyst] [PATCH 16/17] Fix undefined variable: RLIMIT_NOFILE
Date: Sat, 22 Mar 2014 10:03:14 -0700	[thread overview]
Message-ID: <1395507795-13754-17-git-send-email-dolsen@gentoo.org> (raw)
In-Reply-To: <1395507795-13754-1-git-send-email-dolsen@gentoo.org>

It was not imported from resource, it was also not used correctly.
---
 modules/catalyst_support.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index 316dfa3..d493f88 100644
--- a/modules/catalyst_support.py
+++ b/modules/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



  parent reply	other threads:[~2014-03-22 17:04 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
2014-03-22 17:02 ` [gentoo-catalyst] [PATCH 01/17] livecdfs-update: No tmpfs on /lib/firmware Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 02/17] update-modules doesn't exists anymore Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 03/17] depscan.sh " Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 04/17] /etc/conf.d/rc " Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 05/17] Fix merging kernel without kerncache enabled Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 06/17] Rename System.map in a way that it won't be matched if multiple kernel are used Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 07/17] Allow kernelopts as a valid value for kernels Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 08/17] Make use of _kernelopts for hppa Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 09/17] Fix and improve kernel build when kerncache is enabled Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 10/17] Don't make cdtar mandatory Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 11/17] Use the system's iplboot to be sure it matches palo's version Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 12/17] Remove unused hppa cdtar Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 13/17] chmod +x all sh scripts so they can run from the git checkout Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 14/17] chmod +x targets/stage1/build.py Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 15/17] Add more working files, directories to .gitignore Brian Dolbec
2014-03-22 17:03 ` Brian Dolbec [this message]
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 17/17] Fix a relative path bug Brian Dolbec
2014-04-02 20:12 ` [gentoo-catalyst] 2.X bugfixes Brian Dolbec
2014-04-02 20:32   ` Rick "Zero_Chaos" Farina

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=1395507795-13754-17-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