| 1 |
commit: 451fc68241730f0bced468550992d5cd73c3ff95 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 2 00:53:25 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 2 00:55:50 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=451fc682 |
| 7 |
|
| 8 |
ebuild(1): fix ebuild modification check |
| 9 |
|
| 10 |
This has been broken since the setcpv call (triggering metadata |
| 11 |
generation) was added before it in commit |
| 12 |
0b39d24bb8270e5c89eaddfd1f5a4181cf9e31d3. |
| 13 |
|
| 14 |
--- |
| 15 |
bin/ebuild | 25 +++++++++++++------------ |
| 16 |
1 files changed, 13 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/bin/ebuild b/bin/ebuild |
| 19 |
index 9d20a41..58ab46f 100755 |
| 20 |
--- a/bin/ebuild |
| 21 |
+++ b/bin/ebuild |
| 22 |
@@ -215,6 +215,19 @@ def discard_digests(myebuild, mysettings, mydbapi): |
| 23 |
portage._doebuild_manifest_exempt_depend -= 1 |
| 24 |
|
| 25 |
portage.settings.validate() # generate warning messages if necessary |
| 26 |
+ |
| 27 |
+build_dir_phases = set(["setup", "unpack", "prepare", "configure", "compile", |
| 28 |
+ "test", "install", "package", "rpm", "merge", "qmerge"]) |
| 29 |
+ |
| 30 |
+# If the current metadata is invalid then force the ebuild to be |
| 31 |
+# sourced again even if $T/environment already exists. |
| 32 |
+ebuild_changed = False |
| 33 |
+if mytree == "porttree" and build_dir_phases.intersection(pargs): |
| 34 |
+ metadata, st, emtime = \ |
| 35 |
+ portage.portdb._pull_valid_cache(cpv, ebuild, ebuild_portdir) |
| 36 |
+ if metadata is None: |
| 37 |
+ ebuild_changed = True |
| 38 |
+ |
| 39 |
tmpsettings = portage.config(clone=portage.settings) |
| 40 |
tmpsettings["PORTAGE_VERBOSE"] = "1" |
| 41 |
tmpsettings.backup_changes("PORTAGE_VERBOSE") |
| 42 |
@@ -249,18 +262,6 @@ except KeyError: |
| 43 |
# aux_get failure, message should have been shown on stderr. |
| 44 |
sys.exit(1) |
| 45 |
|
| 46 |
-build_dir_phases = set(["setup", "unpack", "prepare", "configure", "compile", |
| 47 |
- "test", "install", "package", "rpm", "merge", "qmerge"]) |
| 48 |
- |
| 49 |
-# If the current metadata is invalid then force the ebuild to be |
| 50 |
-# sourced again even if $T/environment already exists. |
| 51 |
-ebuild_changed = False |
| 52 |
-if mytree == "porttree" and build_dir_phases.intersection(pargs): |
| 53 |
- metadata, st, emtime = \ |
| 54 |
- portage.portdb._pull_valid_cache(cpv, ebuild, ebuild_portdir) |
| 55 |
- if metadata is None: |
| 56 |
- ebuild_changed = True |
| 57 |
- |
| 58 |
def stale_env_warning(): |
| 59 |
if "clean" not in pargs and \ |
| 60 |
"noauto" not in tmpsettings.features and \ |
Archives