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 1RI3An-0006R9-A7 for garchives@archives.gentoo.org; Sun, 23 Oct 2011 18:53:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A5DD21C023; Sun, 23 Oct 2011 18:53:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3CD8D21C023 for ; Sun, 23 Oct 2011 18:53:21 +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 B5618646CC for ; Sun, 23 Oct 2011 18:53:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F088480042 for ; Sun, 23 Oct 2011 18:53:19 +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/main.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: cb4cd5025405b28f76b3487f5eec82590e2cabdb Date: Sun, 23 Oct 2011 18:53:19 +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: X-Archives-Hash: 322b230d9e932f7f365305f866379713 commit: cb4cd5025405b28f76b3487f5eec82590e2cabdb Author: Zac Medico gentoo org> AuthorDate: Sun Oct 23 18:51:43 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Oct 23 18:51:43 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dcb4cd502 Skip global updates prior to sync (called after). --- pym/_emerge/main.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 26f3766..b170ea3 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1611,7 +1611,8 @@ def emerge_main(args=3DNone): tmpcmdline.extend(args) myaction, myopts, myfiles =3D parse_opts(tmpcmdline) =20 - if myaction not in ('help', 'info', 'version') and \ + # skip global updates prior to sync, since it's called after sync + if myaction not in ('help', 'info', 'sync', 'version') and \ myopts.get('--package-moves') !=3D 'n' and \ _global_updates(trees, mtimedb["updates"], quiet=3D("--quiet" in myopt= s)): mtimedb.commit()