merge rev17211 (Need to print the exception string as part of the self.log, or else...

diff --git a/python/vserver.py b/python/vserver.py
index 3760a34..55d78f0 100644 (file)
--- 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