diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-03-03 09:49:56 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-03 09:49:56 +0000 |
| commit | 66b6bcc0df6f5de1897439f834cb5d5879fdfd53 (patch) | |
| tree | 6ad3430e9a5667aeeb50ff16a29aa07ec83fe898 /pym/portage.py | |
| parent | 05de850124dfdd1b0b1031a0cf1ec598965fe50a (diff) | |
| download | portage-66b6bcc0df6f5de1897439f834cb5d5879fdfd53.tar.gz portage-66b6bcc0df6f5de1897439f834cb5d5879fdfd53.tar.bz2 portage-66b6bcc0df6f5de1897439f834cb5d5879fdfd53.zip | |
For bug #138840, show a more informative message when waiting for a distfiles lock due to parallel-fetch. Thanks to David Watzke <david@watzke.cz> for the initial patch. (trunk r6142:6143)
svn path=/main/branches/2.1.2/; revision=6144
Diffstat (limited to 'pym/portage.py')
| -rw-r--r-- | pym/portage.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index e34075437..99a2aa9e8 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2438,10 +2438,19 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", writemsg_stdout("\n", noiselevel=-1) else: if use_locks and can_fetch: + waiting_msg = None + if "parallel-fetch" in features: + waiting_msg = ("Downloading '%s'... " + \ + "see /var/log/emerge-fetch.log for details.") % myfile if locks_in_subdir: - file_lock = portage_locks.lockfile(mysettings["DISTDIR"]+"/"+locks_in_subdir+"/"+myfile,wantnewlockfile=1) + file_lock = portage_locks.lockfile( + os.path.join(mysettings["DISTDIR"], + locks_in_subdir, myfile), wantnewlockfile=1, + waiting_msg=waiting_msg) else: - file_lock = portage_locks.lockfile(mysettings["DISTDIR"]+"/"+myfile,wantnewlockfile=1) + file_lock = portage_locks.lockfile( + myfile_path, wantnewlockfile=1, + waiting_msg=waiting_msg) try: if not listonly: if fsmirrors and not os.path.exists(myfile_path): |