diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-10-12 23:57:29 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-10-12 23:57:29 +0000 |
| commit | 659e3823514dac111b736938bf0992494b328732 (patch) | |
| tree | ec7e3ea8e99b80239604222c3c39c02f4bb7489a /pym | |
| parent | b31b012a6804e1aa809c47af83fc1d82b6e4852d (diff) | |
| download | portage-659e3823514dac111b736938bf0992494b328732.tar.gz portage-659e3823514dac111b736938bf0992494b328732.tar.bz2 portage-659e3823514dac111b736938bf0992494b328732.zip | |
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.
svn path=/main/trunk/; revision=11686
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/__init__.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 49e94dbea..952b4ca92 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -2313,14 +2313,19 @@ class EbuildFetcher(SpawnProcess): 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) |