| 1 |
Author: zmedico |
| 2 |
Date: 2008-10-12 23:57:29 +0000 (Sun, 12 Oct 2008) |
| 3 |
New Revision: 11686 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Bug #234301 - When fetch fails, include the path of the log file in the |
| 9 |
eerror message that's generated. This way it's easy for the user to find |
| 10 |
the output from the fetcher or from the pkg_nofetch phase. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/_emerge/__init__.py 2008-10-12 23:17:56 UTC (rev 11685) |
| 16 |
+++ main/trunk/pym/_emerge/__init__.py 2008-10-12 23:57:29 UTC (rev 11686) |
| 17 |
@@ -2313,14 +2313,19 @@ |
| 18 |
if self.logfile is not None: |
| 19 |
if self.background: |
| 20 |
elog_out = open(self.logfile, 'a') |
| 21 |
- eerror("Fetch failed for '%s'" % self.pkg.cpv, |
| 22 |
- phase="unpack", key=self.pkg.cpv, out=elog_out) |
| 23 |
+ msg = "Fetch failed for '%s'" % (self.pkg.cpv,) |
| 24 |
+ if self.logfile is not None: |
| 25 |
+ msg += ", Log file:" |
| 26 |
+ eerror(msg, phase="unpack", key=self.pkg.cpv, out=elog_out) |
| 27 |
+ if self.logfile is not None: |
| 28 |
+ eerror(" '%s'" % (self.logfile,), |
| 29 |
+ phase="unpack", key=self.pkg.cpv, out=elog_out) |
| 30 |
if elog_out is not None: |
| 31 |
elog_out.close() |
| 32 |
if not self.prefetch: |
| 33 |
portage.elog.elog_process(self.pkg.cpv, self._build_dir.settings) |
| 34 |
features = self._build_dir.settings.features |
| 35 |
- if self.fetchonly or self.returncode == os.EX_OK: |
| 36 |
+ if self.returncode == os.EX_OK: |
| 37 |
self._build_dir.clean() |
| 38 |
self._build_dir.unlock() |
| 39 |
self.config_pool.deallocate(self._build_dir.settings) |
Archives