From f03b9ddfaf67766ccfb493eb31e204b5ec87ecbc Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Tue, 28 Oct 2008 15:04:03 +0000 Subject: Fix bcfg2-admin for new host-specific entries git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4955 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/Cfg.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/lib/Server/Plugins/Cfg.py') diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index 3a4341e73..fee4eb8db 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -86,9 +86,12 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): def list_accept_choices(self, metadata): '''return a list of candidate pull locations''' used = self.get_pertinent_entries(metadata) - if len(used) > 1: - return [] - return [used[0].specific] + ret = [] + if used: + ret.append(used[0].specific) + if not ret[0].hostname: + ret.append(Bcfg2.Server.Plugin.Specificity(hostname=metadata.hostname)) + return ret def build_filename(self, specific): bfname = self.path + '/' + self.path.split('/')[-1] @@ -106,7 +109,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): logger.info("Wrote file %s" % name) badattr = [attr for attr in ['owner', 'group', 'perms'] if attr in new_entry] if badattr: - if hasattr(self.entries[name.split('/')[-1]], 'infoxml'): + if self.infoxml: print "InfoXML support not yet implemented" return metadata_updates = {} -- cgit v1.2.3-1-g7c22