Revision 3a24c527 scripts/gnt-os

b/scripts/gnt-os
24 24

  
25 25
from ganeti.cli import *
26 26
from ganeti import opcodes
27
from ganeti import logger
28 27
from ganeti import objects
29 28
from ganeti import utils
30 29
from ganeti import errors
......
39 38
  result = SubmitOpCode(op)
40 39

  
41 40
  if not result:
42
    logger.ToStdout("Can't get the OS list")
41
    ToStderr("Can't get the OS list")
43 42
    return 1
44 43

  
45 44
  if not opts.no_headers:
......
51 50
                       data=[[row[0]] for row in result if row[1]])
52 51

  
53 52
  for line in data:
54
    logger.ToStdout(line)
53
    ToStdout(line)
55 54

  
56 55
  return 0
57 56

  
......
65 64
  result = SubmitOpCode(op)
66 65

  
67 66
  if not result:
68
    logger.ToStdout("Can't get the OS list")
67
    ToStderr("Can't get the OS list")
69 68
    return 1
70 69

  
71 70
  has_bad = False
......
102 101
    def _OutputPerNodeOSStatus(msg_map):
103 102
      map_k = utils.NiceSort(msg_map.keys())
104 103
      for node_name in map_k:
105
        logger.ToStdout("  Node: %s, status: %s" %
106
                        (node_name, msg_map[node_name]))
104
        ToStdout("  Node: %s, status: %s", node_name, msg_map[node_name])
107 105
        for msg in nodes_hidden[node_name]:
108
          logger.ToStdout(msg)
106
          ToStdout(msg)
109 107

  
110
    logger.ToStdout("OS: %s [global status: %s]" % (os_name, status))
108
    ToStdout("OS: %s [global status: %s]", os_name, status)
111 109
    _OutputPerNodeOSStatus(nodes_valid)
112 110
    _OutputPerNodeOSStatus(nodes_bad)
113
    logger.ToStdout("")
111
    ToStdout("")
114 112

  
115 113
  return int(has_bad)
116 114

  

Also available in: Unified diff