Merge branch 'devel-2.1' into master

[ganeti-local] / lib / rpc.py

diff --git a/lib/rpc.py b/lib/rpc.py
index e099dde..c4a36c9 100644 (file)
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -193,7 +193,7 @@ class RpcResult(object):
     else:
       ec = errors.OpExecError
     if ecode is not None:
-      args = (msg, prereq)
+      args = (msg, ecode)
     else:
       args = (msg, )
     raise ec(*args) # pylint: disable-msg=W0142