1 |
Author: zmedico |
2 |
Date: 2009-03-23 02:22:50 +0000 (Mon, 23 Mar 2009) |
3 |
New Revision: 13167 |
4 |
|
5 |
Modified: |
6 |
main/branches/2.1.6/bin/ebuild |
7 |
Log: |
8 |
Only check for ebuild/eclass modification when a relevant phase is called. |
9 |
(trunk r13150) |
10 |
|
11 |
Modified: main/branches/2.1.6/bin/ebuild |
12 |
=================================================================== |
13 |
--- main/branches/2.1.6/bin/ebuild 2009-03-23 02:22:21 UTC (rev 13166) |
14 |
+++ main/branches/2.1.6/bin/ebuild 2009-03-23 02:22:50 UTC (rev 13167) |
15 |
@@ -195,17 +195,18 @@ |
16 |
tmpsettings.backup_changes("EBUILD_SKIP_MANIFEST") |
17 |
portage._doebuild_manifest_exempt_depend += 1 |
18 |
|
19 |
+build_dir_phases = set(["setup", "unpack", "prepare", "configure", "compile", |
20 |
+ "test", "install", "package", "rpm", "merge", "qmerge"]) |
21 |
+ |
22 |
# If the current metadata is invalid then force the ebuild to be |
23 |
# sourced again even if $T/environment already exists. |
24 |
ebuild_changed = False |
25 |
-metadata, st, emtime = \ |
26 |
- portage.portdb._pull_valid_cache(cpv, ebuild, ebuild_portdir) |
27 |
-if metadata is None: |
28 |
- ebuild_changed = True |
29 |
+if build_dir_phases.intersection(pargs): |
30 |
+ metadata, st, emtime = \ |
31 |
+ portage.portdb._pull_valid_cache(cpv, ebuild, ebuild_portdir) |
32 |
+ if metadata is None: |
33 |
+ ebuild_changed = True |
34 |
|
35 |
-build_dir_phases = set(["setup", "unpack", "prepare", "configure", "compile", |
36 |
- "test", "install", "package", "rpm"]) |
37 |
- |
38 |
def stale_env_warning(): |
39 |
if "clean" not in pargs and \ |
40 |
"noauto" not in tmpsettings.features and \ |