diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-20 09:33:13 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-20 09:33:13 -0400 |
commit | 749afc2a4e7bcffd62e2fbaf7383d90b244215fe (patch) | |
tree | 93683eeb1bf7a42a823821700558dbeea8e187fe | |
parent | 122b009b390816b88d44f8c19d7a4b38ba5f4c3f (diff) | |
download | bcfg2-749afc2a4e7bcffd62e2fbaf7383d90b244215fe.tar.gz bcfg2-749afc2a4e7bcffd62e2fbaf7383d90b244215fe.tar.bz2 bcfg2-749afc2a4e7bcffd62e2fbaf7383d90b244215fe.zip |
removing Cfg-specific behavior from EntrySet
-rw-r--r-- | src/lib/Bcfg2/Server/Plugin.py | 2 | ||||
-rw-r--r-- | testsuite/Testlib/TestServer/TestPlugin.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py index 946b38f75..8a8c093b3 100644 --- a/src/lib/Bcfg2/Server/Plugin.py +++ b/src/lib/Bcfg2/Server/Plugin.py @@ -1086,7 +1086,7 @@ class EntrySet(Debuggable): def get_matching(self, metadata): return [item for item in list(self.entries.values()) - if item.__specific__ and item.specific.matches(metadata)] + if item.specific.matches(metadata)] def best_matching(self, metadata, matching=None): """ Return the appropriate interpreted template from the set of diff --git a/testsuite/Testlib/TestServer/TestPlugin.py b/testsuite/Testlib/TestServer/TestPlugin.py index 8e2a11d9e..1f2f236dd 100644 --- a/testsuite/Testlib/TestServer/TestPlugin.py +++ b/testsuite/Testlib/TestServer/TestPlugin.py @@ -1694,8 +1694,6 @@ class TestEntrySet(TestDebuggable): items[3].specific.matches.return_value = False items[4].specific.matches.return_value = True items[5].specific.matches.return_value = True - for i in items.values(): - i.__specific__ = True metadata = Mock() eset = self.get_obj() eset.entries = items |