From 653fe9d7f8c62b812e5dbd42ab93cf72387f3ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Wei=C3=9F?= Date: Tue, 5 Jul 2011 19:55:56 +0200 Subject: bcfg2-admin compare: Handle all tags If the configuration specifications contain multiple tags, compare all of them, not only the first one. --- src/lib/Server/Admin/Compare.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/lib/Server/Admin/Compare.py') diff --git a/src/lib/Server/Admin/Compare.py b/src/lib/Server/Admin/Compare.py index 1438b6d2d..54f3750e9 100644 --- a/src/lib/Server/Admin/Compare.py +++ b/src/lib/Server/Admin/Compare.py @@ -105,12 +105,11 @@ class Compare(Bcfg2.Server.Admin.Mode): else: print("Unmatched bundle %s" % (bundle.get('name'))) rcs.append(False) - i1 = new.find('./Independent') - i2 = old.find('./Independent') - if self.compareStructures(i1, i2): - new.remove(i1) - old.remove(i2) - else: + i1 = lxml.etree.Element('Independent') + i2 = lxml.etree.Element('Independent') + i1.extend(new.findall('./Independent/*')) + i2.extend(old.findall('./Independent/*')) + if not self.compareStructures(i1, i2): rcs.append(False) return False not in rcs -- cgit v1.2.3-1-g7c22