summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2011-08-27 16:29:25 -0500
committerSol Jerome <sol.jerome@gmail.com>2011-08-27 16:29:25 -0500
commit008ed460fc827903d003cbc11972445664780e99 (patch)
tree7036e8f0b0223ff5e3372b270fa10ef5e003b640 /src
parenta2988f20dd3db239bb35994aa92cb8f3a5328051 (diff)
downloadbcfg2-008ed460fc827903d003cbc11972445664780e99.tar.gz
bcfg2-008ed460fc827903d003cbc11972445664780e99.tar.bz2
bcfg2-008ed460fc827903d003cbc11972445664780e99.zip
Cfg: Fix traceback in bcfg2-admin pull
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/Server/Plugins/Cfg.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py
index da2cb1b59..fd716986c 100644
--- a/src/lib/Server/Plugins/Cfg.py
+++ b/src/lib/Server/Plugins/Cfg.py
@@ -184,9 +184,9 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
if entry.text in ['', None]:
entry.set('empty', 'true')
- def list_accept_choices(self, metadata):
+ def list_accept_choices(self, entry, metadata):
'''return a list of candidate pull locations'''
- used = self.get_pertinent_entries(metadata)
+ used = self.get_pertinent_entries(entry, metadata)
ret = []
if used:
ret.append(used[0].specific)
@@ -245,7 +245,7 @@ class Cfg(Bcfg2.Server.Plugin.GroupSpool,
es_child_cls = Bcfg2.Server.Plugin.SpecificData
def AcceptChoices(self, entry, metadata):
- return self.entries[entry.get('name')].list_accept_choices(metadata)
+ return self.entries[entry.get('name')].list_accept_choices(entry, metadata)
def AcceptPullData(self, specific, new_entry, log):
return self.entries[new_entry.get('name')].write_update(specific,