| 1 |
Author: zmedico |
| 2 |
Date: 2009-01-24 19:14:19 +0000 (Sat, 24 Jan 2009) |
| 3 |
New Revision: 12554 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Remove the emerge-fetch.log lock message code from fetch() since this is |
| 9 |
handled by the EbuildBuild class when it synchronizes with the prefetcher. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2009-01-24 18:26:08 UTC (rev 12553) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2009-01-24 19:14:19 UTC (rev 12554) |
| 16 |
@@ -3720,18 +3720,6 @@ |
| 17 |
has_space = False |
| 18 |
|
| 19 |
if distdir_writable and use_locks: |
| 20 |
- waiting_msg = None |
| 21 |
- if not parallel_fetchonly and "parallel-fetch" in features \ |
| 22 |
- and "EMERGE_FROM" in mysettings: |
| 23 |
- waiting_msg = ("Fetching '%s' " + \ |
| 24 |
- "in the background. " + \ |
| 25 |
- "To view fetch progress, run `tail -f " + \ |
| 26 |
- "/var/log/emerge-fetch.log` in another " + \ |
| 27 |
- "terminal.") % myfile |
| 28 |
- msg_prefix = colorize("GOOD", " * ") |
| 29 |
- from textwrap import wrap |
| 30 |
- waiting_msg = "\n".join(msg_prefix + line \ |
| 31 |
- for line in wrap(waiting_msg, 65)) |
| 32 |
|
| 33 |
if locks_in_subdir: |
| 34 |
lock_file = os.path.join(mysettings["DISTDIR"], |
| 35 |
@@ -3742,8 +3730,6 @@ |
| 36 |
lock_kwargs = {} |
| 37 |
if fetchonly: |
| 38 |
lock_kwargs["flags"] = os.O_NONBLOCK |
| 39 |
- else: |
| 40 |
- lock_kwargs["waiting_msg"] = waiting_msg |
| 41 |
|
| 42 |
try: |
| 43 |
file_lock = portage.locks.lockfile(myfile_path, |
Archives