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

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-05-03 02:55:16 +0000 (Sat, 03 May 2008)
New Revision: 10119

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Fix depgraph.loadResumeCommand() to identify an unsatisfied dependency
and invalidate the resume list in that case.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-05-03 02:31:39 UTC (rev 10118)
+++ main/trunk/pym/_emerge/__init__.py	2008-05-03 02:55:16 UTC (rev 10119)
@@ -4796,8 +4796,19 @@
 				if isinstance(task, Package) and \
 					task.operation == "merge":
 					self._add_pkg(task, None)
-			if not self._create_graph():
+
+			# Allow unsatisfied deps here to avoid showing a masking
+			# message for an unsatisfied dep that isn't necessarily
+			# masked.
+			if not self._create_graph(allow_unsatisfied=True):
 				return False
+			if self._unsatisfied_deps:
+				# This probably means that a required package
+				# was dropped via --skipfirst. It makes the
+				# resume list invalid, so convert it to a
+				# PackageNotFound exception.
+				raise portage.exception.PackageNotFound(
+					self._unsatisfied_deps[0].atom)
 			self._serialized_tasks_cache = None
 			try:
 				self.altlist()
@@ -7665,10 +7676,10 @@
 			out.eerror("Error: The resume list contains packages that are no longer")
 			out.eerror("       available to be emerged. Please restart/continue")
 			out.eerror("       the merge operation manually.")
+		else:
+			if show_spinner:
+				print "\b\b... done!"
 
-		if show_spinner:
-			print "\b\b... done!"
-
 		unsatisfied_block = False
 		if success:
 			mymergelist = mydepgraph.altlist()

-- 
gentoo-commits@l.g.o mailing list