Merge pull request #7543 from yangliping/fix_local_facts_file_checking_portability
Fix portability issue when checking local facts file permission.
This commit is contained in:
commit
e143d7dab7
1 changed files with 2 additions and 1 deletions
|
@ -16,6 +16,7 @@
|
|||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import os
|
||||
import stat
|
||||
import array
|
||||
import errno
|
||||
import fcntl
|
||||
|
@ -177,7 +178,7 @@ class Facts(object):
|
|||
for fn in sorted(glob.glob(fact_path + '/*.fact')):
|
||||
# where it will sit under local facts
|
||||
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
|
||||
# try to read it as json first
|
||||
# if that fails read it with ConfigParser
|
||||
|
|
Loading…
Reference in a new issue