Revision 7f5edc60

b/lib/cli.py
1 1
#
2 2
#
3 3

  
4
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Google Inc.
4
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Google Inc.
5 5
#
6 6
# This program is free software; you can redistribute it and/or modify
7 7
# it under the terms of the GNU General Public License as published by
......
2302 2302
  elif isinstance(err, errors.ParameterError):
2303 2303
    obuf.write("Failure: unknown/wrong parameter name '%s'" % msg)
2304 2304
  elif isinstance(err, luxi.NoMasterError):
2305
    obuf.write("Cannot communicate with the master daemon.\nIs it running"
2306
               " and listening for connections?")
2305
    if err.args[0] == pathutils.MASTER_SOCKET:
2306
      daemon = "master"
2307
    else:
2308
      daemon = "config"
2309
    obuf.write("Cannot communicate with the %s daemon.\nIs it running"
2310
               " and listening for connections?" % daemon)
2307 2311
  elif isinstance(err, luxi.TimeoutError):
2308 2312
    obuf.write("Timeout while talking to the master daemon. Jobs might have"
2309 2313
               " been submitted and will continue to run even if the call"

Also available in: Unified diff