Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
91b0b4d4
Commit
91b0b4d4
authored
Oct 14, 2015
by
James Cammarata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check is_directory() before not is_file() in inventory basedir
Fixes #12742
parent
c5720092
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
lib/ansible/inventory/__init__.py
+3
-3
No files found.
lib/ansible/inventory/__init__.py
View file @
91b0b4d4
...
...
@@ -614,10 +614,10 @@ class Inventory(object):
def
basedir
(
self
):
""" if inventory came from a file, what's the directory? """
dname
=
self
.
host_list
if
not
self
.
is_file
():
dname
=
None
elif
self
.
is_directory
(
self
.
host_list
):
if
self
.
is_directory
(
self
.
host_list
):
dname
=
self
.
host_list
elif
not
self
.
is_file
():
dname
=
None
else
:
dname
=
os
.
path
.
dirname
(
self
.
host_list
)
if
dname
is
None
or
dname
==
''
or
dname
==
'.'
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment