From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Mon, 3 May 2010 19:47:00 +0000 (+0000)
Subject: merge rev17211 (Need to print the exception string as part of the self.log, or else... 
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=inline;h=refs%2Fheads%2Ftrellis;hp=761ff782d1297f255dbc33f21a95ed31a36cb93f;p=util-vserver-pl.git

merge rev17211 (Need to print the exception string as part of the self.log, or else we get a wrong number of argument error.)
---

diff --git a/python/vserver.py b/python/vserver.py
index 3760a34..55d78f0 100644
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -185,7 +185,7 @@ class VServer:
                 vserverimpl.setrlimit(self.ctx, resource_type, hard, soft, min)
             except OSError, e:
                 self.log("Error: setrlimit(%d, %s, %d, %d, %d): %s"
-                         % (self.ctx, type.lower(), hard, soft, min))
+                         % (self.ctx, type.lower(), hard, soft, min, e))
 
         return update