From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8B3051381F3 for ; Tue, 23 Jul 2013 04:42:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58B8DE09B9; Tue, 23 Jul 2013 04:42:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DCAF7E09B9 for ; Tue, 23 Jul 2013 04:42:38 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0204833E975 for ; Tue, 23 Jul 2013 04:42:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9D7A1E5458 for ; Tue, 23 Jul 2013 04:42:36 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1374554542.eec775d6d1ee8b0d4a80ed0ef257a7b47dcf369b.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/repository/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/repository/config.py X-VCS-Directories: pym/portage/repository/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: eec775d6d1ee8b0d4a80ed0ef257a7b47dcf369b X-VCS-Branch: master Date: Tue, 23 Jul 2013 04:42:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7f0ae315-d6b6-4258-b88d-2a63215602e9 X-Archives-Hash: dd7e804938d41a85e06e953c826b0dc7 commit: eec775d6d1ee8b0d4a80ed0ef257a7b47dcf369b Author: Zac Medico gentoo org> AuthorDate: Tue Jul 23 04:42:22 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jul 23 04:42:22 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=eec775d6 RepoConfigLoader: PORTDIR/repos.conf interaction --- pym/portage/repository/config.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 232e9cb..e6d37a8 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -438,7 +438,9 @@ class RepoConfigLoader(object): if repos_conf_opts is not None: # Selectively copy only the attributes which # repos.conf is allowed to override. - for k in ('aliases', 'eclass_overrides', 'masters', 'priority'): + for k in ('aliases', 'eclass_overrides', 'masters', + 'priority', 'sync_cvs_repo', 'sync_type', + 'sync_uri'): v = getattr(repos_conf_opts, k, None) if v is not None: setattr(repo, k, v) @@ -480,7 +482,7 @@ class RepoConfigLoader(object): return portdir @staticmethod - def _parse(paths, prepos, ignored_map, ignored_location_map, local_config): + def _parse(paths, prepos, ignored_map, ignored_location_map, local_config, portdir): """Parse files in paths to load config""" parser = SafeConfigParser() @@ -536,6 +538,14 @@ class RepoConfigLoader(object): repo = RepoConfig(sname, optdict, local_config=local_config) + if repo.location and \ + not exists_raise_eaccess(repo.location) and \ + prepos['DEFAULT'].main_repo == repo.name and \ + portdir and exists_raise_eaccess(portdir): + optdict['location'] = portdir + print optdict + repo = RepoConfig(sname, optdict, local_config=local_config) + if repo.name != sname and not portage._sync_disabled_warnings: writemsg_level("!!! %s\n" % _("Section name '%s' set in repos.conf differs from name '%s' set inside repository") % (sname, repo.name), level=logging.ERROR, noiselevel=-1) @@ -593,7 +603,8 @@ class RepoConfigLoader(object): try: self._parse(paths, prepos, ignored_map, - ignored_location_map, settings.local_config) + ignored_location_map, settings.local_config, + portdir) except ConfigParserError as e: writemsg( _("!!! Error while reading repo config file: %s\n") % e,