From 606d909d81292f1ef78f0be2e4476e6a9d5e11ad Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 27 Jul 2007 13:26:26 +0000
Subject: [PATCH] =?UTF-8?q?Use=20OutputTable=20for=20=E2=80=9Cgnt-os=20lis?=
=?UTF-8?q?t=E2=80=9D.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Reviewed-by: iustinp
---
scripts/gnt-os | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/scripts/gnt-os b/scripts/gnt-os
index 00cb5da57..0b484cb45 100755
--- a/scripts/gnt-os
+++ b/scripts/gnt-os
@@ -46,19 +46,20 @@ def ListOS(opts, args):
oses[node_name] = [obj for obj in result[node_name]
if isinstance(obj, objects.OS)]
+ # Get intersection of all OSes
fnode = oses.keys()[0]
os_set = set([os_inst.name for os_inst in oses[fnode]])
del oses[fnode]
for node in oses:
os_set &= set([os_inst.name for os_inst in oses[node]])
- format = "%s"
-
if not opts.no_headers:
- logger.ToStdout(format % 'Name')
+ headers = {"name": "Name"}
+ else:
+ headers = None
- for os_name in os_set:
- logger.ToStdout(format % os_name)
+ OutputTable(separator=None, headers=headers, fields=["name"],
+ data=[[os] for os in os_set])
return 0
--
GitLab