[gentoo-commits] portage r11682 - main/trunk/pym/_emerge

[gentoo-commits] portage r11682 - main/trunk/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-10-12 19:59:32 +0000 (Sun, 12 Oct 2008)
New Revision: 11682

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Now that only prefetch (parallel-fetch) output goes to the global fetch
log, update code to remove inappropriate references to this log.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-10-12 02:15:00 UTC (rev 11681)
+++ main/trunk/pym/_emerge/__init__.py	2008-10-12 19:59:32 UTC (rev 11682)
@@ -8993,8 +8993,7 @@
 			emergelog(self.xterm_titles, *pargs, **kwargs)
 
 	class _failed_pkg(SlotObject):
-		__slots__ = ("build_dir", "build_log",
-			"fetch_log", "pkg", "returncode")
+		__slots__ = ("build_dir", "build_log", "pkg", "returncode")
 
 	class _ConfigPool(object):
 		"""Interface for a task to temporarily allocate a config
@@ -9126,7 +9125,7 @@
 			elif len(mergelist) > 1:
 				self._parallel_fetch = True
 
-		if background or self._parallel_fetch:
+		if self._parallel_fetch:
 				# clear out existing fetch log if it exists
 				try:
 					open(self._fetch_log, 'w')
@@ -9684,9 +9683,6 @@
 
 		log_paths = [failed_pkg.build_log]
 
-		if not (build_dir and os.path.isdir(build_dir)):
-			log_paths.append(failed_pkg.fetch_log)
-
 		for log_path in log_paths:
 			if not log_path:
 				continue
@@ -9726,11 +9722,10 @@
 			settings = merge.merge.settings
 			build_dir = settings.get("PORTAGE_BUILDDIR")
 			build_log = settings.get("PORTAGE_LOG_FILE")
-			fetch_log = self._fetch_log
 
 			self._failed_pkgs.append(self._failed_pkg(
 				build_dir=build_dir, build_log=build_log,
-				fetch_log=fetch_log, pkg=pkg,
+				pkg=pkg,
 				returncode=merge.returncode))
 			self._failed_pkg_msg(self._failed_pkgs[-1], "install", "to")
 
@@ -9770,12 +9765,11 @@
 		else:
 			settings = build.settings
 			build_dir = settings.get("PORTAGE_BUILDDIR")
-			fetch_log = self._fetch_log
 			build_log = settings.get("PORTAGE_LOG_FILE")
 
 			self._failed_pkgs.append(self._failed_pkg(
 				build_dir=build_dir, build_log=build_log,
-				fetch_log=fetch_log, pkg=build.pkg,
+				pkg=build.pkg,
 				returncode=build.returncode))
 			self._failed_pkg_msg(self._failed_pkgs[-1], "emerge", "for")