Revision 4f898534

b/lib/cmdlib.py
1153 1153
  iallocator = getattr(lu.op, iallocator_slot, None)
1154 1154

  
1155 1155
  if node is not None and iallocator is not None:
1156
    raise errors.OpPrereqError("Do not specify both, iallocator and node.",
1156
    raise errors.OpPrereqError("Do not specify both, iallocator and node",
1157 1157
                               errors.ECODE_INVAL)
1158 1158
  elif node is None and iallocator is None:
1159 1159
    default_iallocator = lu.cfg.GetDefaultIAllocator()
......
1161 1161
      setattr(lu.op, iallocator_slot, default_iallocator)
1162 1162
    else:
1163 1163
      raise errors.OpPrereqError("No iallocator or node given and no"
1164
                                 " cluster-wide default iallocator found."
1165
                                 " Please specify either an iallocator or a"
1164
                                 " cluster-wide default iallocator found;"
1165
                                 " please specify either an iallocator or a"
1166 1166
                                 " node, or set a cluster-wide default"
1167
                                 " iallocator.")
1167
                                 " iallocator")
1168 1168

  
1169 1169

  
1170 1170
class LUClusterPostInit(LogicalUnit):

Also available in: Unified diff