new bcfg2-admin pull infrastructure

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4444 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 5 insertions, 3 deletions

diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index f9f330736..7fdf8b3fc 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -67,7 +67,10 @@ class Plugin(object):
         '''This is the slow-path handler for configuration entry binding'''
         raise PluginExecutionError
 
-    def AcceptEntry(self, metadata, entry_type, entry_name, data):
+    def AcceptChoices(self, entry, metadata):
+        raise PluginExecutionError
+    
+    def AcceptPullData(self, specific, new_entry):
         '''This is the null per-plugin implementation
         of bcfg2-admin pull'''
         raise PluginExecutionError
@@ -398,6 +401,7 @@ class Specificity:
         self.all = False
         self.group = None
         self.prio = 0
+        self.delta = False
         data = reg.match(fname)
         if not data:
             raise SpecificityError(fname)
@@ -410,8 +414,6 @@ class Specificity:
             self.all = True
         if 'delta' in data.groupdict():
             self.delta = data.group('delta')
-        else:
-            self.delta = False
 
     def matches(self, metadata):
         return self.all or \