From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RtRox-0001O8-P6 for garchives@archives.gentoo.org; Fri, 03 Feb 2012 22:41:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C252E0595; Fri, 3 Feb 2012 22:41:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 26408E0595 for ; Fri, 3 Feb 2012 22:41:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A52D51B4006 for ; Fri, 3 Feb 2012 22:41:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DE5FC8004F for ; Fri, 3 Feb 2012 22:41:21 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <9ad263416ec282d8c6cf007ca84bf716c49c4f69.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: 9ad263416ec282d8c6cf007ca84bf716c49c4f69 Date: Fri, 3 Feb 2012 22:41:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6d59d6f5-00cf-453b-a012-c119bb2b4aeb X-Archives-Hash: 6e61770dab6cf14fce5e8bd39dceae04 commit: 9ad263416ec282d8c6cf007ca84bf716c49c4f69 Author: Daniel Hornung gmx de> AuthorDate: Fri Feb 3 22:33:35 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Feb 3 22:33:35 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D9ad26341 Honor repos.conf for overlay priority, bug 402099 Signed-off-by: Zac Medico gentoo.org> --- pym/portage/repository/config.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/co= nfig.py index 3207b30..ebee234 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -341,7 +341,7 @@ 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'): + for k in ('aliases', 'eclass_overrides', 'masters', 'priority'): v =3D getattr(repos_conf_opts, k, None) if v is not None: setattr(repo, k, v) @@ -356,7 +356,7 @@ class RepoConfigLoader(object): =20 if ov =3D=3D portdir and portdir not in port_ov: repo.priority =3D -1000 - else: + elif repo.priority is None: repo.priority =3D base_priority base_priority +=3D 1 =20