External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix some encoding issues for custom inventory scripts

Browse Source
This commit is contained in:
Matthew Jones
2014-10-20 13:04:05 -04:00
parent cbc7f6ec36
commit 0f068f6127
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/tasks.py
View File

@@ -291,7 +291,7 @@ class BaseTask(Task):
continue continue
elif hidden_re.search(k): elif hidden_re.search(k):
env[k] = HIDDEN_PASSWORD env[k] = HIDDEN_PASSWORD
elif urlpass_re.match(v): elif type(v) == str and urlpass_re.match(v):
env[k] = urlpass_re.sub(HIDDEN_PASSWORD, v) env[k] = urlpass_re.sub(HIDDEN_PASSWORD, v)
return env return env
@@ -1047,7 +1047,7 @@ class RunInventoryUpdate(BaseTask):
elif inventory_update.source == 'custom': elif inventory_update.source == 'custom':
for env_k in inventory_update.source_vars_dict: for env_k in inventory_update.source_vars_dict:
if env_k not in os.environ: if env_k not in os.environ:
env[env_k] = inventory_update.source_vars_dict[env_k] env[env_k] = unicode(inventory_update.source_vars_dict[env_k])
return env return env
def build_args(self, inventory_update, **kwargs): def build_args(self, inventory_update, **kwargs):
@@ -1119,7 +1119,7 @@ class RunInventoryUpdate(BaseTask):
handle, path = tempfile.mkstemp(dir=runpath) handle, path = tempfile.mkstemp(dir=runpath)
f = os.fdopen(handle, 'w') f = os.fdopen(handle, 'w')
# Check that source_script is not none and exists and that .script is not an empty string # Check that source_script is not none and exists and that .script is not an empty string
f.write(inventory_update.source_script.script) f.write(inventory_update.source_script.script.encode('utf-8'))
f.close() f.close()
os.chmod(path, stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR) os.chmod(path, stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR)
args.append(runpath) args.append(runpath)