summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-11 03:26:10 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-11 03:26:10 +0000
commit578d25257ab43631fc51f13f83873cbfcb3c3ef6 (patch)
tree63966e4f734daf682c7509727afb7ebc95f9a6e6
parent7b7f3bf3d32fab03682705c719fb18667257cb70 (diff)
downloadportage-578d25257ab43631fc51f13f83873cbfcb3c3ef6.tar.gz
portage-578d25257ab43631fc51f13f83873cbfcb3c3ef6.tar.bz2
portage-578d25257ab43631fc51f13f83873cbfcb3c3ef6.zip
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
-rw-r--r--pym/portage/__init__.py14
1 files changed, 0 insertions, 14 deletions
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,