1 |
Author: zmedico |
2 |
Date: 2008-10-12 19:59:32 +0000 (Sun, 12 Oct 2008) |
3 |
New Revision: 11682 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Now that only prefetch (parallel-fetch) output goes to the global fetch |
9 |
log, update code to remove inappropriate references to this log. |
10 |
|
11 |
|
12 |
Modified: main/trunk/pym/_emerge/__init__.py |
13 |
=================================================================== |
14 |
--- main/trunk/pym/_emerge/__init__.py 2008-10-12 02:15:00 UTC (rev 11681) |
15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-10-12 19:59:32 UTC (rev 11682) |
16 |
@@ -8993,8 +8993,7 @@ |
17 |
emergelog(self.xterm_titles, *pargs, **kwargs) |
18 |
|
19 |
class _failed_pkg(SlotObject): |
20 |
- __slots__ = ("build_dir", "build_log", |
21 |
- "fetch_log", "pkg", "returncode") |
22 |
+ __slots__ = ("build_dir", "build_log", "pkg", "returncode") |
23 |
|
24 |
class _ConfigPool(object): |
25 |
"""Interface for a task to temporarily allocate a config |
26 |
@@ -9126,7 +9125,7 @@ |
27 |
elif len(mergelist) > 1: |
28 |
self._parallel_fetch = True |
29 |
|
30 |
- if background or self._parallel_fetch: |
31 |
+ if self._parallel_fetch: |
32 |
# clear out existing fetch log if it exists |
33 |
try: |
34 |
open(self._fetch_log, 'w') |
35 |
@@ -9684,9 +9683,6 @@ |
36 |
|
37 |
log_paths = [failed_pkg.build_log] |
38 |
|
39 |
- if not (build_dir and os.path.isdir(build_dir)): |
40 |
- log_paths.append(failed_pkg.fetch_log) |
41 |
- |
42 |
for log_path in log_paths: |
43 |
if not log_path: |
44 |
continue |
45 |
@@ -9726,11 +9722,10 @@ |
46 |
settings = merge.merge.settings |
47 |
build_dir = settings.get("PORTAGE_BUILDDIR") |
48 |
build_log = settings.get("PORTAGE_LOG_FILE") |
49 |
- fetch_log = self._fetch_log |
50 |
|
51 |
self._failed_pkgs.append(self._failed_pkg( |
52 |
build_dir=build_dir, build_log=build_log, |
53 |
- fetch_log=fetch_log, pkg=pkg, |
54 |
+ pkg=pkg, |
55 |
returncode=merge.returncode)) |
56 |
self._failed_pkg_msg(self._failed_pkgs[-1], "install", "to") |
57 |
|
58 |
@@ -9770,12 +9765,11 @@ |
59 |
else: |
60 |
settings = build.settings |
61 |
build_dir = settings.get("PORTAGE_BUILDDIR") |
62 |
- fetch_log = self._fetch_log |
63 |
build_log = settings.get("PORTAGE_LOG_FILE") |
64 |
|
65 |
self._failed_pkgs.append(self._failed_pkg( |
66 |
build_dir=build_dir, build_log=build_log, |
67 |
- fetch_log=fetch_log, pkg=build.pkg, |
68 |
+ pkg=build.pkg, |
69 |
returncode=build.returncode)) |
70 |
self._failed_pkg_msg(self._failed_pkgs[-1], "emerge", "for") |