Merge branch 'release_3.1.3' into devel

* release_3.1.3:
  create .lock file without needing the proj dir to exist
  work around a change in ansible 2.3 to `Task.get_name()`
  mock message obect in callback receiver test
This commit is contained in:
Matthew Jones
2017-05-01 14:35:11 -04:00
3 changed files with 14 additions and 7 deletions

View File

@@ -205,7 +205,11 @@ class ProjectOptions(models.Model):
return sorted(results, key=lambda x: smart_str(x).lower())
def get_lock_file(self):
proj_path = self.get_project_path()
'''
We want the project path in name only, we don't care if it exists or
not. This method will just append .lock onto the full directory path.
'''
proj_path = self.get_project_path(check_if_exists=False)
if not proj_path:
return None
return proj_path + '.lock'