Revision 40b068e5

b/lib/watcher/__init__.py
1 1
#
2 2
#
3 3

  
4
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Google Inc.
4
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 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
......
303 303
      continue
304 304

  
305 305
    if inst.status in HELPLESS_STATES or _CheckForOfflineNodes(nodes, inst):
306
      logging.info("Skipping instance '%s' because it is in a helpless state or"
307
                   " has offline secondaries", name)
306
      logging.info("Skipping instance '%s' because it is in a helpless state"
307
                   " or has offline secondaries", name)
308 308
      continue
309 309

  
310 310
    job.append(opcodes.OpInstanceActivateDisks(instance_name=name))
......
367 367
  parser.add_option("--wait-children", dest="wait_children",
368 368
                    action="store_true", help="Wait for child processes")
369 369
  parser.add_option("--no-wait-children", dest="wait_children",
370
                    action="store_false", help="Don't wait for child processes")
370
                    action="store_false",
371
                    help="Don't wait for child processes")
371 372
  # See optparse documentation for why default values are not set by options
372 373
  parser.set_defaults(wait_children=True)
373 374
  options, args = parser.parse_args()
......
706 707
    raise errors.GenericError("Node group '%s' is not known by ssconf" %
707 708
                              group_uuid)
708 709

  
709
  # Group UUID has been verified and should not contain any dangerous characters
710
  # Group UUID has been verified and should not contain any dangerous
711
  # characters
710 712
  state_path = constants.WATCHER_GROUP_STATE_FILE % group_uuid
711 713
  inst_status_path = constants.WATCHER_GROUP_INSTANCE_STATUS_FILE % group_uuid
712 714

  

Also available in: Unified diff