diff options
Diffstat (limited to 'src/lib/Server/Plugin.py')
| -rw-r--r-- | src/lib/Server/Plugin.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index 186d1198a..73d054409 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -680,7 +680,7 @@ class SpecificData(object): class EntrySet: """Entry sets deal with the host- and group-specific entries.""" - ignore = re.compile("^(\.#.*|.*~|\\..*\\.(sw[px]))$") + ignore = re.compile("^(\.#.*|.*~|\\..*\\.(sw[px])|.*\\.genshi_include)$") def __init__(self, basename, path, entry_type, encoding): self.path = path self.entry_type = entry_type @@ -784,10 +784,10 @@ class EntrySet: return cmp(x.specific.prio, y.specific.prio) def bind_info_to_entry(self, entry, metadata): - if not self.infoxml: - for key in self.metadata: - entry.set(key, self.metadata[key]) - else: + # first set defaults from global metadata/:info + for key in self.metadata: + entry.set(key, self.metadata[key]) + if self.infoxml: mdata = {} self.infoxml.pnode.Match(metadata, mdata) if 'Info' not in mdata: |