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 1PuaJc-0008WQ-OP for garchives@archives.gentoo.org; Wed, 02 Mar 2011 00:53:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8A23E031D; Wed, 2 Mar 2011 00:53:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7BCC5E031D for ; Wed, 2 Mar 2011 00:53:12 +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 F23001B409A for ; Wed, 2 Mar 2011 00:53:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 58BD68006A for ; Wed, 2 Mar 2011 00:53:11 +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: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: fc48bb45e2c6ca331b1d1df7a57ea82e705b2439 Date: Wed, 2 Mar 2011 00:53:11 +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: b3cd8f590a71e3bf76f0aa7edc8b1ac6 commit: fc48bb45e2c6ca331b1d1df7a57ea82e705b2439 Author: Zac Medico gentoo org> AuthorDate: Wed Mar 2 00:53:25 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Mar 2 00:53:25 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dfc48bb45 ebuild(1): fix ebuild modification check This has been broken since the setcpv call (triggering metadata generation) was added before it in commit 0b39d24bb8270e5c89eaddfd1f5a4181cf9e31d3. --- bin/ebuild | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/bin/ebuild b/bin/ebuild index a8296e8..d6cdc66 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -217,6 +217,19 @@ def discard_digests(myebuild, mysettings, mydbapi): portage._doebuild_manifest_exempt_depend -=3D 1 =20 portage.settings.validate() # generate warning messages if necessary + +build_dir_phases =3D set(["setup", "unpack", "prepare", "configure", "co= mpile", + "test", "install", "package", "rpm", "merge", "qmerge"]) + +# If the current metadata is invalid then force the ebuild to be +# sourced again even if $T/environment already exists. +ebuild_changed =3D False +if mytree =3D=3D "porttree" and build_dir_phases.intersection(pargs): + metadata, st, emtime =3D \ + portage.portdb._pull_valid_cache(cpv, ebuild, ebuild_portdir) + if metadata is None: + ebuild_changed =3D True + tmpsettings =3D portage.config(clone=3Dportage.settings) tmpsettings["PORTAGE_VERBOSE"] =3D "1" tmpsettings.backup_changes("PORTAGE_VERBOSE") @@ -251,18 +264,6 @@ except KeyError: # aux_get failure, message should have been shown on stderr. sys.exit(1) =20 -build_dir_phases =3D set(["setup", "unpack", "prepare", "configure", "co= mpile", - "test", "install", "package", "rpm", "merge", "qmerge"]) - -# If the current metadata is invalid then force the ebuild to be -# sourced again even if $T/environment already exists. -ebuild_changed =3D False -if mytree =3D=3D "porttree" and build_dir_phases.intersection(pargs): - metadata, st, emtime =3D \ - portage.portdb._pull_valid_cache(cpv, ebuild, ebuild_portdir) - if metadata is None: - ebuild_changed =3D True - def stale_env_warning(): if "clean" not in pargs and \ "noauto" not in tmpsettings.features and \