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 7E8271381F3 for ; Mon, 29 Jul 2013 17:23:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35E94E0983; Mon, 29 Jul 2013 17:23:25 +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 C1CBAE0983 for ; Mon, 29 Jul 2013 17:23:24 +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 D6BAC33BF0D for ; Mon, 29 Jul 2013 17:23:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5B297E468F for ; Mon, 29 Jul 2013 17:23:22 +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: <1375118582.a3a1a20a1378e423486d41414857a25f9bec1c66.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: a3a1a20a1378e423486d41414857a25f9bec1c66 X-VCS-Branch: master Date: Mon, 29 Jul 2013 17:23:22 +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: f198508c-643e-49e3-9b7c-bc6b9f775812 X-Archives-Hash: 0bd6f73f6c07b4e5d552e9b9c4c9c83e commit: a3a1a20a1378e423486d41414857a25f9bec1c66 Author: Zac Medico gentoo org> AuthorDate: Mon Jul 29 17:23:02 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jul 29 17:23:02 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a3a1a20a Suppress duplicate repo warning for bug #478544. --- pym/portage/repository/config.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 7620c5f..5c37da3 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -453,11 +453,13 @@ class RepoConfigLoader(object): setattr(repo, k, v) if repo.name in prepos: + # Silently ignore when PORTDIR overrides the location + # setting from the default repos.conf (bug #478544). old_location = prepos[repo.name].location if old_location is not None and \ old_location != repo.location and \ - not (old_location == default_portdir and - not exists_raise_eaccess(old_location)): + not (base_priority == 0 and + old_location == default_portdir): ignored_map.setdefault(repo.name, []).append(old_location) ignored_location_map[old_location] = repo.name if old_location == portdir: