diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py | 6 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py index 8f71c45c8..aedf579fc 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py @@ -44,7 +44,7 @@ class CfgLegacyInfo(CfgInfo): dict([(key, value) for key, value in list(match.groupdict().items()) if value]) - if ('perms' in self.metadata and - len(self.metadata['perms']) == 3): - self.metadata['perms'] = "0%s" % self.metadata['perms'] + if ('mode' in self.metadata and + len(self.metadata['mode']) == 3): + self.metadata['mode'] = "0%s" % self.metadata['mode'] handle_event.__doc__ = CfgInfo.handle_event.__doc__ diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py index 82b792fe0..114cdab70 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py @@ -515,12 +515,12 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): generator = self.best_matching(metadata, self.get_handlers(metadata, CfgGenerator)) - if entry.get('perms').lower() == 'inherit': + if entry.get('mode').lower() == 'inherit': # use on-disk permissions - LOGGER.warning("Cfg: %s: Use of perms='inherit' is deprecated" % + LOGGER.warning("Cfg: %s: Use of mode='inherit' is deprecated" % entry.get("name")) fname = os.path.join(self.path, generator.name) - entry.set('perms', + entry.set('mode', str(oct(stat.S_IMODE(os.stat(fname).st_mode)))) try: return generator.get_data(entry, metadata) @@ -607,7 +607,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): raise Bcfg2.Server.Plugin.PluginExecutionError(msg) open(name, 'w').write(etext) self.debug_log("Wrote file %s" % name, flag=log) - badattr = [attr for attr in ['owner', 'group', 'perms'] + badattr = [attr for attr in ['owner', 'group', 'mode'] if attr in new_entry] if badattr: # check for info files and inform user of their removal |