diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-12 13:02:59 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-12 13:02:59 +0000 |
commit | 28dd2ba113f40370586d693dd62e699897521ed8 (patch) | |
tree | 16032707e914bdadafea74319a510c0a7c43e7ff /morphlib/buildcommand.py | |
parent | f3197d814a5e883f47631a4f0acfa51bd1285daf (diff) | |
parent | 7e975343c7f00e98962d2edd07ac87630c4936c4 (diff) | |
download | morph-28dd2ba113f40370586d693dd62e699897521ed8.tar.gz |
Merge branch 'sam/cached-repo-cleanup'
Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk>
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Diffstat (limited to 'morphlib/buildcommand.py')
-rw-r--r-- | morphlib/buildcommand.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py index 5c7d5c5e..a22e689b 100644 --- a/morphlib/buildcommand.py +++ b/morphlib/buildcommand.py @@ -399,13 +399,13 @@ class BuildCommand(object): source.repo = self.lrc.get_repo(repo_name) try: sha1 = source.sha1 - source.repo.resolve_ref(sha1) + source.repo.resolve_ref_to_commit(sha1) self.app.status(msg='Not updating git repository ' '%(repo_name)s because it ' 'already contains sha1 %(sha1)s', chatty=True, repo_name=repo_name, sha1=sha1) - except morphlib.cachedrepo.InvalidReferenceError: + except morphlib.gitdir.InvalidRefError: self.app.status(msg='Updating %(repo_name)s', repo_name=repo_name) source.repo.update() |