diff options
| author | Jason Kincl <kincljc@ornl.gov> | 2012-12-04 08:14:33 -0500 |
|---|---|---|
| committer | Jason Kincl <kincljc@ornl.gov> | 2012-12-04 08:14:33 -0500 |
| commit | 09a45d745269a419b0c5da0664912e061dc8e5d3 (patch) | |
| tree | c5c0af33093087f10f0caf5ce021aa4cb0b4a879 /src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | |
| parent | 648c8f6e313e684d5fadc1fdbc97e08d83eb2b16 (diff) | |
| parent | f35c38e87eafffb497338b9273fe84f284a41dcf (diff) | |
| download | bcfg2-09a45d745269a419b0c5da0664912e061dc8e5d3.tar.gz bcfg2-09a45d745269a419b0c5da0664912e061dc8e5d3.tar.bz2 bcfg2-09a45d745269a419b0c5da0664912e061dc8e5d3.zip | |
Merge remote branch 'upstream/master' into jasons-hacking
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py index db6810e7c..f8712213e 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py @@ -11,7 +11,8 @@ import Bcfg2.Options import Bcfg2.Server.Plugin import Bcfg2.Server.Lint # pylint: disable=W0622 -from Bcfg2.Compat import u_str, unicode, b64encode, walk_packages, any +from Bcfg2.Compat import u_str, unicode, b64encode, walk_packages, any, \ + oct_mode # pylint: enable=W0622 LOGGER = logging.getLogger(__name__) @@ -538,7 +539,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): entry.get("name")) fname = os.path.join(self.path, generator.name) entry.set('mode', - str(oct(stat.S_IMODE(os.stat(fname).st_mode)))) + oct_mode(stat.S_IMODE(os.stat(fname).st_mode))) try: return generator.get_data(entry, metadata) except: |