diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-12-04 15:53:16 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-12-04 15:53:16 +0000 |
commit | fc5d4e58753d113d898744c1924b13ddc34e526e (patch) | |
tree | d2f17a4258a3af5a6dee2ee4edc5a367103c5cc2 /morphlib/sysbranchdir.py | |
parent | 0861a2054145b9558f108e0662b35061db2a19ec (diff) | |
parent | b9af32ba9f60b66ef1487438f97a37c54bf95b3b (diff) | |
download | morph-fc5d4e58753d113d898744c1924b13ddc34e526e.tar.gz |
Merge branch 'sam/build-branch-fixes'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Diffstat (limited to 'morphlib/sysbranchdir.py')
-rw-r--r-- | morphlib/sysbranchdir.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/morphlib/sysbranchdir.py b/morphlib/sysbranchdir.py index 4351c6b3..4dbc5f6c 100644 --- a/morphlib/sysbranchdir.py +++ b/morphlib/sysbranchdir.py @@ -72,7 +72,11 @@ class SystemBranchDirectory(object): def _find_git_directory(self, repo_url): for gd in self.list_git_directories(): - if gd.get_config('morph.repository') == repo_url: + try: + gd_repo_url = gd.get_config('morph.repository') + except cliapp.AppException: # pragma: no cover + continue + if gd_repo_url == repo_url: return gd.dirname return None |