diff options
| author |   Tim Harder <radhermit@gmail.com> | 2015-11-20 22:30:37 -0500 |
|---|---|---|
| committer | Tim Harder <radhermit@gmail.com> | 2015-11-20 22:32:17 -0500 |
| commit | 21a188572955eedfa95f3d1daca1ac467e1b2f33 (patch) | |
| tree | 450870e37f6e8fe70d5b57f51e17548308460346 | |
| parent | domain: drop unfiltered repo groups (diff) | |
| download | pkgcore-21a188572955eedfa95f3d1daca1ac467e1b2f33.tar.gz pkgcore-21a188572955eedfa95f3d1daca1ac467e1b2f33.tar.bz2 pkgcore-21a188572955eedfa95f3d1daca1ac467e1b2f33.zip | |
repo_objs: use repos.conf config names as aliases instead of repo_ids
Fixes syncing via repos.conf names after the initial sync.
| -rw-r--r-- | pkgcore/ebuild/repo_objs.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgcore/ebuild/repo_objs.py b/pkgcore/ebuild/repo_objs.py index 4481fc821..fef68cb4a 100644 --- a/pkgcore/ebuild/repo_objs.py +++ b/pkgcore/ebuild/repo_objs.py @@ -399,6 +399,8 @@ 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()))) @@ -524,9 +526,7 @@ class RepoConfig(syncable.tree): if val is None: if not self.is_empty: logger.warning("repository at location %r lacks a defined repo_name", self.location) - val = getattr(self, 'config_name', None) - if val is None: - val = '<unlabeled repository %s>' % self.location + val = '<unlabeled repository %s>' % self.location return val.strip() arch_profiles = klass.alias_attr('profiles.arch_profiles') |