Merge pull request #1556 from ryanpetrello/fix-1490

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

View File

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