Add a repo_name to Source, use that instead of repo in most places.

This is because we will need to integrate a RemoteRepoCache and we don't
always want to create a CachedRepo object (in fact, we only want that
for the sources of artifacts we actually need to build). So we'll use
either the local or the remote repo cache to resolve refs and morphology
texts and then later, when actually caching a repo, we'll set the
source.repo member to a CachedRepo object that we can then use to
unpack the sources.

1 files changed, 5 insertions, 5 deletions

diff --git a/morphlib/sourcepool.py b/morphlib/sourcepool.py
index 0f144ef2..b91f0f25 100644
--- a/morphlib/sourcepool.py
+++ b/morphlib/sourcepool.py
@@ -22,25 +22,25 @@ class SourcePool(object):
         self._sources = {}
         self._order = []
 
-    def _key(self, reponame, original_ref, filename):
-        return (reponame, original_ref, filename)
+    def _key(self, repo_name, original_ref, filename):
+        return (repo_name, original_ref, filename)
 
     def add(self, source):
         '''Add a source to the pool.'''
-        key = self._key(source.repo.original_name,
+        key = self._key(source.repo_name,
                         source.original_ref,
                         source.filename)
         self._sources[key] = source
         self._order.append(source)
 
-    def lookup(self, reponame, original_ref, filename):
+    def lookup(self, repo_name, original_ref, filename):
         '''Find a source in the pool.
         
         Raise KeyError if it is not found.
         
         '''
         
-        key = self._key(reponame, original_ref, filename)
+        key = self._key(repo_name, original_ref, filename)
         return self._sources[key]
 
     def __iter__(self):