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

Merge pull request #1556 from ryanpetrello/fix-1490

Browse Source 
fix a bug in custom virtualenv when Project.organization is None
This commit is contained in:
Wayne Witzel III
2018-04-25 07:01:47 -04:00
committed by GitHub
parent 2d9c4cff32 c98ede2f27
commit ce65914143
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/jobs.py
View File

@@ -538,7 +538,7 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana
for virtualenv in ( for virtualenv in (
self.job_template.custom_virtualenv if self.job_template else None, self.job_template.custom_virtualenv if self.job_template else None,
self.project.custom_virtualenv, self.project.custom_virtualenv,
self.project.organization.custom_virtualenv self.project.organization.custom_virtualenv if self.project.organization else None
): ):
if virtualenv: if virtualenv:
return virtualenv return virtualenv