From fb38dbc61d33d68ffd528820a15f621572237bdf Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= <caglar@cs.princeton.edu>
Date: Mon, 3 May 2010 19:47:00 +0000
Subject: [PATCH] merge rev17211 (Need to print the exception string as part of
 the self.log, or else we get a wrong number of argument error.)

---
 python/vserver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 
-- 
2.47.0