From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Mon, 26 Oct 2009 05:40:02 +0000 (+0000)
Subject: infinity is greater than anything.
X-Git-Tag: util-vserver-pl-0.3-19~3
X-Git-Url: http://git.onelab.eu/?p=util-vserver-pl.git;a=commitdiff_plain;h=2c2adaa008b660087eceabb98b42f98ab7cb3ce3

infinity is greater than anything.
---

diff --git a/python/vserver.py b/python/vserver.py
index 6e5c709..c5464c5 100644
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -136,15 +136,15 @@ def adjust_lim(goal, curr):
     soft = curr[0]
     hard = curr[1]
     if gm != VC_LIM_KEEP:
-        if gm > soft:
+        if gm > soft or gm == resource.RLIM_INFINITY:
             soft = gm
-        if gm > hard:
+        if gm > hard or gs == resource.RLIM_INFINITY:
             hard = gm
     if gs != VC_LIM_KEEP:
-        if gs > soft:
+        if gs > soft or gs == resource.RLIM_INFINITY:
             soft = gs
     if gh != VC_LIM_KEEP:
-        if gh > hard:
+        if gh > hard or gh == resource.RLIM_INFINITY:
             hard = gh
     return (soft, hard)