From 0b69a35bb21341d006a1463f8683d249eae3229a Mon Sep 17 00:00:00 2001 From: Mike McCallister Date: Sat, 23 Jul 2011 10:25:26 -0500 Subject: Treat Bound entries like unbound entries for calculating prerequisites in Deps. --- src/lib/Server/Plugins/Deps.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/lib/Server/Plugins/Deps.py b/src/lib/Server/Plugins/Deps.py index cedee4d8b..3a538292e 100644 --- a/src/lib/Server/Plugins/Deps.py +++ b/src/lib/Server/Plugins/Deps.py @@ -71,9 +71,12 @@ class Deps(Bcfg2.Server.Plugin.PrioDir, entries = [] for structure in structures: for entry in structure.getchildren(): - if (entry.tag, entry.get('name')) not in entries \ - and not isinstance(entry, lxml.etree._Comment): - entries.append((entry.tag, entry.get('name'))) + tag = entry.tag + if tag.startswith('Bound'): + tag = tag[5:] + if (tag, entry.get('name')) not in entries \ + and not isinstance(entry, lxml.etree._Comment): + entries.append((tag, entry.get('name'))) entries.sort() entries = tuple(entries) gdata = list(metadata.groups) @@ -101,9 +104,8 @@ class Deps(Bcfg2.Server.Plugin.PrioDir, set of entries. """ prereqs = [] - [src.Cache(metadata) for src in list(self.entries.values())] + [src.Cache(metadata) for src in self.entries.values()] - import ipdb; ipdb.set_trace() toexamine = list(entries[:]) while toexamine: entry = toexamine.pop() -- cgit v1.2.3-1-g7c22