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 8A4C11381F3 for ; Tue, 18 Jun 2013 16:14:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AD42E0384; Tue, 18 Jun 2013 16:14:06 +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 AD582E0384 for ; Tue, 18 Jun 2013 16:14:05 +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 C6A4A33E577 for ; Tue, 18 Jun 2013 16:14:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4AEB9E468F for ; Tue, 18 Jun 2013 16:14:03 +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: <1371572023.86d69ef86ab2a9addec6a290a1c3958bc2ba55de.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: 86d69ef86ab2a9addec6a290a1c3958bc2ba55de X-VCS-Branch: master Date: Tue, 18 Jun 2013 16:14:03 +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: 6a2ae644-e37f-4b46-ad1d-65edc8d74553 X-Archives-Hash: 8ecc93fc903b9c08fa0acfe04f2d6735 commit: 86d69ef86ab2a9addec6a290a1c3958bc2ba55de Author: Zac Medico gentoo org> AuthorDate: Tue Jun 18 16:13:43 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jun 18 16:13:43 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=86d69ef8 RepoConfigLoader: delete repo if location missing --- pym/portage/repository/config.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index da8c365..a63bc9c 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -508,8 +508,16 @@ class RepoConfigLoader(object): # Do this before expanding aliases, so that location_map and # treemap consistently map unaliased names whenever available. - for repo_name, repo in prepos.items(): - if repo.location is not None: + for repo_name, repo in list(prepos.items()): + if repo.location is None: + if repo_name != 'DEFAULT': + if paths: + writemsg_level(_("Location undefined for " \ + "repository '%s' referenced in '%s'\n") % \ + (repo.name, paths[0]), + level=logging.ERROR, noiselevel=-1) + del prepos[repo_name] + else: location_map[repo.location] = repo_name treemap[repo_name] = repo.location