Remove the emerge-fetch.log lock message code from fetch() since this is

handled by the EbuildBuild class when it synchronizes with the prefetcher.

svn path=/main/trunk/; revision=12554

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 7f2acefb19e2ac06a4b2ca5a00358575d7fb6a7a..b2f0a16201d2840ad2af3d63503fc04a111ac26c 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3720,18 +3720,6 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                        has_space = False
 
                        if distdir_writable and use_locks:
-                               waiting_msg = None
-                               if not parallel_fetchonly and "parallel-fetch" in features \
-                                       and "EMERGE_FROM" in mysettings:
-                                       waiting_msg = ("Fetching '%s' " + \
-                                               "in the background. " + \
-                                               "To view fetch progress, run `tail -f " + \
-                                               "/var/log/emerge-fetch.log` in another " + \
-                                               "terminal.") % myfile
-                                       msg_prefix = colorize("GOOD", " * ")
-                                       from textwrap import wrap
-                                       waiting_msg = "\n".join(msg_prefix + line \
-                                               for line in wrap(waiting_msg, 65))
 
                                if locks_in_subdir:
                                        lock_file = os.path.join(mysettings["DISTDIR"],
@@ -3742,8 +3730,6 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                lock_kwargs = {}
                                if fetchonly:
                                        lock_kwargs["flags"] = os.O_NONBLOCK
-                               else:
-                                       lock_kwargs["waiting_msg"] = waiting_msg
 
                                try:
                                        file_lock = portage.locks.lockfile(myfile_path,