diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-09-01 11:03:38 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-09-01 11:03:38 -0500 |
| commit | cc9237d2be14c96201ea2410cfac21ec34caf8e6 (patch) | |
| tree | f74d7a973098e4b8076fa65469c5b6474e6583f6 /src/lib/Bcfg2/Client/Tools/POSIX/base.py | |
| parent | f6a142aed6756449974ab38bacf98d47e29dda3e (diff) | |
| parent | 8a36d9dccc6c4aed460763fb20083877c77a34cd (diff) | |
| download | bcfg2-cc9237d2be14c96201ea2410cfac21ec34caf8e6.tar.gz bcfg2-cc9237d2be14c96201ea2410cfac21ec34caf8e6.tar.bz2 bcfg2-cc9237d2be14c96201ea2410cfac21ec34caf8e6.zip | |
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Conflicts:
src/lib/Bcfg2/Client/Tools/__init__.py
src/lib/Bcfg2/Server/BuiltinCore.py
src/lib/Bcfg2/Server/Plugins/Metadata.py
src/lib/Bcfg2/Server/Plugins/NagiosGen.py
src/lib/Bcfg2/Server/Plugins/Probes.py
src/lib/Bcfg2/Server/SSLServer.py
tools/README
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/POSIX/base.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/base.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py index c9164cb88..bd2f8f87e 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py @@ -525,7 +525,8 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): if entry.get("secontext") == "__default__": try: wanted_secontext = \ - selinux.matchpathcon(path, 0)[1].split(":")[2] + selinux.matchpathcon( + path, ondisk[stat.ST_MODE])[1].split(":")[2] except OSError: errors.append("%s has no default SELinux context" % entry.get("name")) |