Commit e143d7da by Michael DeHaan

Merge pull request #7543 from yangliping/fix_local_facts_file_checking_portability

Fix portability issue when checking local facts file permission.
parents 1e427d4a aedf134f
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
import os import os
import stat
import array import array
import errno import errno
import fcntl import fcntl
...@@ -177,7 +178,7 @@ class Facts(object): ...@@ -177,7 +178,7 @@ class Facts(object):
for fn in sorted(glob.glob(fact_path + '/*.fact')): for fn in sorted(glob.glob(fact_path + '/*.fact')):
# where it will sit under local facts # where it will sit under local facts
fact_base = os.path.basename(fn).replace('.fact','') fact_base = os.path.basename(fn).replace('.fact','')
if os.access(fn, os.X_OK): if stat.S_IXUSR & os.stat(fn)[stat.ST_MODE]:
# run it # run it
# try to read it as json first # try to read it as json first
# if that fails read it with ConfigParser # if that fails read it with ConfigParser
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment