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

Fix race condition that causes InvalidGitRepositoryError

Browse Source
This commit is contained in:
Shane McDonald
2021-03-30 13:33:17 -04:00
parent 16c18886e8
commit 4a726b7f6f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/tasks.py
View File

@@ -1807,13 +1807,14 @@ class RunJob(BaseTask):
logger.debug('Performing fresh clone of {} on this instance.'.format(job.project)) logger.debug('Performing fresh clone of {} on this instance.'.format(job.project))
sync_needs.append(source_update_tag) sync_needs.append(source_update_tag)
elif job.project.scm_type == 'git' and job.project.scm_revision and (not branch_override): elif job.project.scm_type == 'git' and job.project.scm_revision and (not branch_override):
git_repo = git.Repo(project_path)
try: try:
git_repo = git.Repo(project_path)
if job_revision == git_repo.head.commit.hexsha: if job_revision == git_repo.head.commit.hexsha:
logger.debug('Skipping project sync for {} because commit is locally available'.format(job.log_format)) logger.debug('Skipping project sync for {} because commit is locally available'.format(job.log_format))
else: else:
sync_needs.append(source_update_tag) sync_needs.append(source_update_tag)
except (ValueError, BadGitName): except (ValueError, BadGitName, git.exc.InvalidGitRepositoryError):
logger.debug('Needed commit for {} not in local source tree, will sync with remote'.format(job.log_format)) logger.debug('Needed commit for {} not in local source tree, will sync with remote'.format(job.log_format))
sync_needs.append(source_update_tag) sync_needs.append(source_update_tag)
else: else: