Commit dcde0241 authored by Guido Trotter's avatar Guido Trotter
Browse files

OpVerifyDisks returns a list, not a tuple

Fixing the check in gnt-cluster, or gnt-cluster verify-disks is broken.
Since the version in 1.2 used to return a tuple we'll accept both.

Reviewed-by: iustinp
parent 6657590e
...@@ -236,7 +236,7 @@ def VerifyDisks(opts, args): ...@@ -236,7 +236,7 @@ def VerifyDisks(opts, args):
""" """
op = opcodes.OpVerifyDisks() op = opcodes.OpVerifyDisks()
result = SubmitOpCode(op) result = SubmitOpCode(op)
if not isinstance(result, tuple) or len(result) != 4: if not isinstance(result, (list, tuple)) or len(result) != 4:
raise errors.ProgrammerError("Unknown result type for OpVerifyDisks") raise errors.ProgrammerError("Unknown result type for OpVerifyDisks")
nodes, nlvm, instances, missing = result nodes, nlvm, instances, missing = result
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment