default to repos.conf names for repo IDs

This should make things more consistent from the user's viewpoint
especially when binpkg repos.conf support is merged.

2 files changed, 5 insertions, 3 deletions

diff --git a/pkgcore/ebuild/repo_objs.py b/pkgcore/ebuild/repo_objs.py
index fef68cb4a..20063466c 100644
--- a/pkgcore/ebuild/repo_objs.py
+++ b/pkgcore/ebuild/repo_objs.py
@@ -399,8 +399,6 @@ class RepoConfig(syncable.tree):
             masters = tuple(iter_stable_unique(masters.split()))
         sf(self, 'masters', masters)
         aliases = data.get('aliases', '').split() + [self.repo_id, self.location]
-        if self.config_name is not None:
-            aliases.append(self.config_name)
         sf(self, 'aliases', tuple(iter_stable_unique(aliases)))
         sf(self, 'eapis_deprecated', tuple(iter_stable_unique(data.get('eapis-deprecated', '').split())))
 
@@ -517,6 +515,10 @@ class RepoConfig(syncable.tree):
 
     @klass.jit_attr
     def repo_id(self):
+        # repos.conf name overrides everything
+        if self.config_name is not None:
+            return self.config_name
+
         # repo-name setting from metadata/layout.conf
         # overrides profiles/repo_name if it exists
         if self.repo_name is not None:
diff --git a/pkgcore/util/commandline.py b/pkgcore/util/commandline.py
index 171aa3115..02c560017 100644
--- a/pkgcore/util/commandline.py
+++ b/pkgcore/util/commandline.py
@@ -315,7 +315,7 @@ class StoreRepoObject(StoreConfigObject):
         """
         for repo_name, repo in sorted(unstable_unique(sections.iteritems())):
             if len(repo.aliases) > 1 and hasattr(repo, 'location'):
-                yield '%s:%s' % (repo.aliases[0], repo.location)
+                yield '%s:%s' % (repo.repo_id, repo.location)
             else:
                 yield getattr(repo, 'repo_id', repo_name)