Revision 738436bf lib/cmdlib/common.py

b/lib/cmdlib/common.py
58 58
  @raise errors.OpPrereqError: if the item is not found
59 59

  
60 60
  """
61
  full_name = expand_fn(name)
62
  if full_name is None:
61
  (uuid, full_name) = expand_fn(name)
62
  if uuid is None or full_name is None:
63 63
    raise errors.OpPrereqError("%s '%s' not known" % (kind, name),
64 64
                               errors.ECODE_NOENT)
65
  return full_name
65
  return (uuid, full_name)
66 66

  
67 67

  
68 68
def ExpandInstanceUuidAndName(cfg, expected_uuid, name):

Also available in: Unified diff