summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-01-17 10:23:34 -0800
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-01-17 10:23:34 -0800
commit3eaa251a603c45149bd72c34fe3d4c2b3e4e8890 (patch)
tree25208aabb937588680dcb1146493708c4cc9eceb
parent4616b296ddcc036eb9770d7aefac63fe5057253f (diff)
parent81e82b4e21056031dab53523275fe985d856aa32 (diff)
downloadbcfg2-3eaa251a603c45149bd72c34fe3d4c2b3e4e8890.tar.gz
bcfg2-3eaa251a603c45149bd72c34fe3d4c2b3e4e8890.tar.bz2
bcfg2-3eaa251a603c45149bd72c34fe3d4c2b3e4e8890.zip
Merge pull request #13 from wgen/minor_cleanup
Since XMLSrc doesn't return anything from Cache(), don't bother looking ...
-rw-r--r--src/lib/Server/Plugin.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index 86f843aca..294d97853 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -826,11 +826,9 @@ class PrioDir(Plugin, Generator, XMLDirectoryBacked):
def get_attrs(self, entry, metadata):
""" get a list of attributes to add to the entry during the bind """
- for src in list(self.entries.values()):
- cached = src.Cache(metadata)
- if cached == False:
- self.logger.error("Called before data loaded")
- raise PluginExecutionError
+ for src in self.entries.values():
+ src.Cache(metadata)
+
matching = [src for src in list(self.entries.values())
if (src.cache and
entry.tag in src.cache[1] and