Revision 305a7297 lib/rpc.py

b/lib/rpc.py
607 607 
        if data:
608 608 
          if isinstance(data, dict):
609 609 
            nr.append(objects.OS.FromDict(data))
610 
          elif isinstance(data, tuple) and len(data) == 2:
611 
            nr.append(errors.InvalidOS(data[0], data[1]))
610 
          elif isinstance(data, tuple) and len(data) == 3:
611 
            nr.append(errors.InvalidOS(data[0], data[1], data[2]))
612 612 
          else:
613 613 
            raise errors.ProgrammerError("Invalid data from"
614 614 
                                         " xcserver.os_diagnose")
......
631 631 
    data = result[node_name]
632 632 
    if isinstance(data, dict):
633 633 
      new_result[node_name] = objects.OS.FromDict(data)
634 
    elif isinstance(data, tuple) and len(data) == 2:
635 
      new_result[node_name] = errors.InvalidOS(data[0], data[1])
634 
    elif isinstance(data, tuple) and len(data) == 3:
635 
      new_result[node_name] = errors.InvalidOS(data[0], data[1], data[2])
636 636 
    else:
637 637 
      new_result[node_name] = data
638 638 
  return new_result

Also available in: Unified diff