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 903DE1381F3 for ; Mon, 23 Sep 2013 20:45:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52AD6E0B38; Mon, 23 Sep 2013 20:44:57 +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 E9015E0B38 for ; Mon, 23 Sep 2013 20:44:56 +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 AFB1B33EAD3 for ; Mon, 23 Sep 2013 20:44:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 66A66E468F for ; Mon, 23 Sep 2013 20:44:54 +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: <1379969074.923f912d7c5ade8b5b18f23f1cd12add08f73c21.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: 923f912d7c5ade8b5b18f23f1cd12add08f73c21 X-VCS-Branch: master Date: Mon, 23 Sep 2013 20:44:54 +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: a13dce79-84ca-4366-a286-689dee7b77b5 X-Archives-Hash: 4e35cf9fbe74719d6c54782560e60673 commit: 923f912d7c5ade8b5b18f23f1cd12add08f73c21 Author: Zac Medico gentoo org> AuthorDate: Mon Sep 23 20:44:34 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Sep 23 20:44:34 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=923f912d emerge-webrsync: handle missing dir, bug #484950 --- pym/portage/repository/config.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index bb63b1a..b14eeb7 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -443,7 +443,10 @@ class RepoConfigLoader(object): #overlay priority is negative because we want them to be looked before any other repo base_priority = 0 for ov in overlays: - if isdir_raise_eaccess(ov): + # Ignore missing directory for 'gentoo' so that + # first sync with emerge-webrsync is possible. + if isdir_raise_eaccess(ov) or \ + (base_priority == 0 and ov is portdir): repo_opts = default_repo_opts.copy() repo_opts['location'] = ov repo = RepoConfig(None, repo_opts, local_config=local_config) @@ -643,6 +646,10 @@ class RepoConfigLoader(object): writemsg_level("!!! %s\n" % _("Section '%s' in repos.conf has location attribute set " "to nonexistent directory: '%s'") % (repo_name, repo.location), level=logging.ERROR, noiselevel=-1) + + # Ignore missing directory for 'gentoo' so that + # first sync with emerge-webrsync is possible. + if repo.name != 'gentoo': del prepos[repo_name] continue