Some fixups (to bf1984a13e8ea624aba7d74773dfbd2829d48c44?)

Change-Id: I259674554900df5982341e0dcfca1242b76e8479

1 files changed, 2 insertions, 7 deletions

diff --git a/morphlib/repocache.py b/morphlib/repocache.py
index 17951f84..86002f3b 100644
--- a/morphlib/repocache.py
+++ b/morphlib/repocache.py
@@ -247,11 +247,6 @@ class RepoCache(object):
         '''
         errors = []
 
-        try:
-            return self._get_repo(reponame)
-        except NotCached as e:
-            pass
-
         repourl = self._resolver.pull_url(reponame)
         path = self._cache_name(repourl)
         if self._tarball_base_url:
@@ -278,7 +273,7 @@ class RepoCache(object):
 
         self.fs.rename(target, path)
 
-        repo = self._get_repo(reponame)
+        repo = self._new_cached_repo_instance(reponame, repourl, path)
         repo.already_updated = True
         return repo
 
@@ -295,7 +290,7 @@ class RepoCache(object):
                 self._cached_repo_objects[reponame] = repo
                 return repo
             elif self.update_gits:
-                return self.cache_repo(reponame)
+                return self._cache_repo(reponame)
             else:
                 raise NotCached(reponame)