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 <gentoo-commits+bounces-347660-garchives=archives.gentoo.org@lists.gentoo.org>) id 1QPOUH-0000X2-Br for garchives@archives.gentoo.org; Thu, 26 May 2011 00:31:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B66391C019; Thu, 26 May 2011 00:31:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 826BF1C019 for <gentoo-commits@lists.gentoo.org>; Thu, 26 May 2011 00:31:31 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B62D01B4004 for <gentoo-commits@lists.gentoo.org>; Thu, 26 May 2011 00:31:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1ECFC80505 for <gentoo-commits@lists.gentoo.org>; Thu, 26 May 2011 00:31:30 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <84c3c39ce28b8211b3d1ad2eeb1f5813aff857e8.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 84c3c39ce28b8211b3d1ad2eeb1f5813aff857e8 Date: Thu, 26 May 2011 00:31:30 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 80bc2bd0e2b64e4b91d5456b6957de68 commit: 84c3c39ce28b8211b3d1ad2eeb1f5813aff857e8 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Thu May 26 00:30:36 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu May 26 00:30:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D84c3c39c rebuilt-binaries: prefer newer unbuilt --- pym/_emerge/depgraph.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 341b3a6..d7ddd1a 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3902,11 +3902,15 @@ class depgraph(object): if rebuilt_binaries: inst_pkg =3D None built_pkg =3D None + unbuilt_pkg =3D None for pkg in matched_packages: if pkg.installed: inst_pkg =3D pkg elif pkg.built: built_pkg =3D pkg + else: + if unbuilt_pkg is None or pkg > unbuilt_pkg: + unbuilt_pkg =3D pkg if built_pkg is not None and inst_pkg is not None: # Only reinstall if binary package BUILD_TIME is # non-empty, in order to avoid cases like to @@ -3922,7 +3926,9 @@ class depgraph(object): except (KeyError, ValueError): installed_timestamp =3D 0 =20 - if "--rebuilt-binaries-timestamp" in self._frozen_config.myopts: + if unbuilt_pkg is not None and unbuilt_pkg > built_pkg: + pass + elif "--rebuilt-binaries-timestamp" in self._frozen_config.myopts: minimal_timestamp =3D self._frozen_config.myopts["--rebuilt-binari= es-timestamp"] if built_timestamp and \ built_timestamp > installed_timestamp and \