From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 11 Mar 2009 03:26:10 +0000 (-0000)
Subject: Remove the emerge-fetch.log lock message code from fetch() since this is
X-Git-Tag: v2.1.6.8~237
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=578d25257ab43631fc51f13f83873cbfcb3c3ef6;p=portage.git

Remove the emerge-fetch.log lock message code from fetch() since this is
handled by the EbuildBuild class when it synchronizes with the prefetcher.
(trunk r12554)

svn path=/main/branches/2.1.6/; revision=12840
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index ea035a987..a7a1206cd 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3710,18 +3710,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"],
@@ -3732,8 +3720,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,