Merge branch 'sam/cached-repo-cleanup'

Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk>
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>

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()