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 1RYr1g-0006qF-BL for garchives@archives.gentoo.org; Fri, 09 Dec 2011 03:21:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D5FF21C0A5; Fri, 9 Dec 2011 03:21:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3DB2821C0A5 for ; Fri, 9 Dec 2011 03:21:25 +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 BA2751B4010 for ; Fri, 9 Dec 2011 03:21:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2E8B080042 for ; Fri, 9 Dec 2011 03:21:24 +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: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d5700b8579a9a8756b0a0e4b1ae801322593d28b Date: Fri, 9 Dec 2011 03:21:24 +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: 6f97ace3-fdfe-4694-84ad-7c8516e03cfe X-Archives-Hash: 6f17088660216ecc4256ebeabeaa72a2 commit: d5700b8579a9a8756b0a0e4b1ae801322593d28b Author: Zac Medico gentoo org> AuthorDate: Fri Dec 9 03:21:13 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Dec 9 03:21:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd5700b85 load_emerge_config: init portage.data earlier The portage_uid initialization here must to happend before the _init_dirs() calls. --- pym/_emerge/actions.py | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 2849598..54c9774 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2987,19 +2987,22 @@ def load_emerge_config(trees=3DNone): kwargs[k] =3D v trees =3D portage.create_trees(trees=3Dtrees, **kwargs) =20 - for root, root_trees in trees.items(): - settings =3D root_trees["vartree"].settings - settings._init_dirs() - setconfig =3D load_default_config(settings, root_trees) - root_trees["root_config"] =3D RootConfig(settings, root_trees, setconf= ig) - settings =3D trees[trees._target_eroot]['vartree'].settings mtimedbfile =3D os.path.join(settings['EROOT'], portage.CACHE_PATH, "mt= imedb") mtimedb =3D portage.MtimeDB(mtimedbfile) portage.output._init(config_root=3Dsettings['PORTAGE_CONFIGROOT']) + # The portage_uid initialization here must to happend before + # the _init_dirs() calls below. portage.data._init(settings) QueryCommand._db =3D trees - return settings, trees, mtimedb + + for root, root_trees in trees.items(): + settings =3D root_trees["vartree"].settings + settings._init_dirs() + setconfig =3D load_default_config(settings, root_trees) + root_trees["root_config"] =3D RootConfig(settings, root_trees, setconf= ig) +=09 + return trees[trees._target_eroot]['vartree'].settings, trees, mtimedb =20 def chk_updated_cfg_files(eroot, config_protect): target_root =3D eroot