External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 15:27:47 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from tgerla/fix-inventory-plugins

Browse Source 
Fix inventory plugin import handling
This commit is contained in:
Michael DeHaan
2013-08-15 08:27:52 -07:00
parent 5d8ef49cfd f78eb15e41
commit 9729c6d203
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/management/commands/inventory_import.py
View File

@@ -253,7 +253,7 @@ class ExecutableJsonLoader(BaseLoader):
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(stdout, stderr) = proc.communicate() (stdout, stderr) = proc.communicate()
if proc.returncode != 0: if proc.returncode != 0:
raise ImportException("%s list failed %s with output: %s" % (src, stderr, proc.returncode)) raise ImportException("%s list failed %s with output: %s" % (cmd, stderr, proc.returncode))
data = {} data = {}
try: try:
data = json.loads(stdout) data = json.loads(stdout)
@@ -338,7 +338,7 @@ class GenericLoader(object):
for f in glob.glob("%s/*" % src): for f in glob.glob("%s/*" % src):
if f.endswith(".ini"): if f.endswith(".ini"):
# config files for inventory scripts should be ignored # config files for inventory scripts should be ignored
pass continue
if not os.path.isdir(f): if not os.path.isdir(f):
if os.access(f, os.X_OK): if os.access(f, os.X_OK):
ExecutableJsonLoader().load(f, memGroup) ExecutableJsonLoader().load(f, memGroup)