Revision 797506fc lib/cli.py

b/lib/cli.py
1302 1302
    obuf.write("Parameter Error: %s" % msg)
1303 1303
  elif isinstance(err, errors.ParameterError):
1304 1304
    obuf.write("Failure: unknown/wrong parameter name '%s'" % msg)
1305
  elif isinstance(err, errors.GenericError):
1306
    obuf.write("Unhandled Ganeti error: %s" % msg)
1307 1305
  elif isinstance(err, luxi.NoMasterError):
1308 1306
    obuf.write("Cannot communicate with the master daemon.\nIs it running"
1309 1307
               " and listening for connections?")
......
1313 1311
  elif isinstance(err, luxi.ProtocolError):
1314 1312
    obuf.write("Unhandled protocol error while talking to the master daemon:\n"
1315 1313
               "%s" % msg)
1314
  elif isinstance(err, errors.GenericError):
1315
    obuf.write("Unhandled Ganeti error: %s" % msg)
1316 1316
  elif isinstance(err, JobSubmittedException):
1317 1317
    obuf.write("JobID: %s\n" % err.args[0])
1318 1318
    retcode = 0

Also available in: Unified diff