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 1RZeAa-0007Ey-Tu for garchives@archives.gentoo.org; Sun, 11 Dec 2011 07:50:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59F3021C0C5; Sun, 11 Dec 2011 07:49:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2ABD021C0C5 for ; Sun, 11 Dec 2011 07:49:53 +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 A82B21B400D for ; Sun, 11 Dec 2011 07:49:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1D3D68004A for ; Sun, 11 Dec 2011 07:49:52 +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: d67d11c82338a6d9ee073eab18bd0e24cd846c77 Date: Sun, 11 Dec 2011 07:49:52 +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: 65be6d9e-8356-4933-9bec-af9c48af6778 X-Archives-Hash: f3f77fa6915c2ef7ef72e618dda1f8c7 commit: d67d11c82338a6d9ee073eab18bd0e24cd846c77 Author: Zac Medico gentoo org> AuthorDate: Sun Dec 11 07:49:40 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Dec 11 07:49:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd67d11c8 load_emerge_config: change order of code back A couple of recent commits touched this function, and code got moved around unnecessarily. --- pym/_emerge/actions.py | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 484f6b0..b3d0b12 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2987,18 +2987,17 @@ def load_emerge_config(trees=3DNone): kwargs[k] =3D v trees =3D portage.create_trees(trees=3Dtrees, **kwargs) =20 - 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) - QueryCommand._db =3D trees - 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 + + 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) + QueryCommand._db =3D trees + return settings, trees, mtimedb =20 def chk_updated_cfg_files(eroot, config_protect): target_root =3D eroot