Author: zmedico
Date: 2008-10-12 23:57:29 +0000 (Sun, 12 Oct 2008)
New Revision: 11686
Modified:
main/trunk/pym/_emerge/__init__.py
Log:
Bug #234301 - When fetch fails, include the path of the log file in the
eerror message that's generated. This way it's easy for the user to find
the output from the fetcher or from the pkg_nofetch phase.
Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py 2008-10-12 23:17:56 UTC (rev 11685)
+++ main/trunk/pym/_emerge/__init__.py 2008-10-12 23:57:29 UTC (rev 11686)
@@ -2313,14 +2313,19 @@
if self.logfile is not None:
if self.background:
elog_out = open(self.logfile, 'a')
- eerror("Fetch failed for '%s'" % self.pkg.cpv,
- phase="unpack", key=self.pkg.cpv, out=elog_out)
+ msg = "Fetch failed for '%s'" % (self.pkg.cpv,)
+ if self.logfile is not None:
+ msg += ", Log file:"
+ eerror(msg, phase="unpack", key=self.pkg.cpv, out=elog_out)
+ if self.logfile is not None:
+ eerror(" '%s'" % (self.logfile,),
+ phase="unpack", key=self.pkg.cpv, out=elog_out)
if elog_out is not None:
elog_out.close()
if not self.prefetch:
portage.elog.elog_process(self.pkg.cpv, self._build_dir.settings)
features = self._build_dir.settings.features
- if self.fetchonly or self.returncode == os.EX_OK:
+ if self.returncode == os.EX_OK:
self._build_dir.clean()
self._build_dir.unlock()
self.config_pool.deallocate(self._build_dir.settings)
|
