From a424ce50d45a3f96037e08004ebef763c460dc35 Mon Sep 17 00:00:00 2001
From: Alexander Schreiber <als@google.com>
Date: Tue, 22 Apr 2008 14:02:43 +0000
Subject: [PATCH] Correctly filter out Domain-0 from domain list if requested.
Reviewed-by: ultrotter
---
lib/hypervisor.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/hypervisor.py b/lib/hypervisor.py
index 515f19695..5c60c6eab 100644
--- a/lib/hypervisor.py
+++ b/lib/hypervisor.py
@@ -170,12 +170,8 @@ class XenHypervisor(BaseHypervisor):
raise HypervisorError("xm list failed, retries exceeded (%s): %s" %
(result.fail_reason, result.stderr))
- # skip over the heading and the domain 0 line (optional)
- if include_node:
- to_skip = 1
- else:
- to_skip = 2
- lines = result.stdout.splitlines()[to_skip:]
+ # skip over the heading
+ lines = result.stdout.splitlines()[1:]
result = []
for line in lines:
# The format of lines is:
@@ -192,7 +188,11 @@ class XenHypervisor(BaseHypervisor):
except ValueError, err:
raise HypervisorError("Can't parse output of xm list,"
" line: %s, error: %s" % (line, err))
- result.append(data)
+
+ # skip the Domain-0 (optional)
+ if include_node or data[0] != 'Domain-0':
+ result.append(data)
+
return result
def ListInstances(self):
--
GitLab