diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2011-01-22 09:56:45 -0600 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2011-01-22 09:56:45 -0600 |
| commit | 670bce6e830389387742fdee185356bf337673fb (patch) | |
| tree | 9ad389cdddb327dd682f4943cdfa67ac9174c1b3 /src | |
| parent | 1e601ac56f7a91631274f26dfc3cef7a4be5b3bc (diff) | |
| download | bcfg2-670bce6e830389387742fdee185356bf337673fb.tar.gz bcfg2-670bce6e830389387742fdee185356bf337673fb.tar.bz2 bcfg2-670bce6e830389387742fdee185356bf337673fb.zip | |
Cfg: pull file permissions defaults uniformly (Resolves Ticket #958) (Patch from unidentified openid user)
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Plugin.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index 186d1198a..84d5896a5 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -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: |