[gentoo-commits] portage r12829 - main/branches/2.1.6/pym/_emerge

[gentoo-commits] portage r12829 - main/branches/2.1.6/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-03-11 03:20:18 +0000 (Wed, 11 Mar 2009)
New Revision: 12829

Modified:
   main/branches/2.1.6/pym/_emerge/__init__.py
Log:
Bug #199408 - Always enable the skip_masked and skip_unsatisfied for the
resume_depgraph() function. This will cause emerge --resume to automatically
drop masked packages (without the need to specify --skipfirst). (trunk r12543)

Modified: main/branches/2.1.6/pym/_emerge/__init__.py
===================================================================
--- main/branches/2.1.6/pym/_emerge/__init__.py	2009-03-11 03:19:54 UTC (rev 12828)
+++ main/branches/2.1.6/pym/_emerge/__init__.py	2009-03-11 03:20:18 UTC (rev 12829)
@@ -10851,7 +10851,7 @@
 		try:
 			success, mydepgraph, dropped_tasks = resume_depgraph(
 				self.settings, self.trees, self._mtimedb, self.myopts,
-				myparams, self._spinner, skip_unsatisfied=True)
+				myparams, self._spinner)
 		except depgraph.UnsatisfiedResumeDep, e:
 			mydepgraph = e.depgraph
 			dropped_tasks = set()
@@ -13306,14 +13306,15 @@
 	else:
 		print "Number removed:       "+str(len(cleanlist))
 
-def resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner,
-	skip_masked=False, skip_unsatisfied=False):
+def resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner):
 	"""
 	Construct a depgraph for the given resume list. This will raise
 	PackageNotFound or depgraph.UnsatisfiedResumeDep when necessary.
 	@rtype: tuple
 	@returns: (success, depgraph, dropped_tasks)
 	"""
+	skip_masked = True
+	skip_unsatisfied = True
 	mergelist = mtimedb["resume"]["mergelist"]
 	dropped_tasks = set()
 	while True:
@@ -13516,14 +13517,11 @@
 					del mergelist[i]
 					break
 
-		skip_masked      = "--skipfirst" in myopts
-		skip_unsatisfied = "--skipfirst" in myopts
 		success = False
 		mydepgraph = None
 		try:
 			success, mydepgraph, dropped_tasks = resume_depgraph(
-				settings, trees, mtimedb, myopts, myparams, spinner,
-				skip_masked=skip_masked, skip_unsatisfied=skip_unsatisfied)
+				settings, trees, mtimedb, myopts, myparams, spinner)
 		except (portage.exception.PackageNotFound,
 			depgraph.UnsatisfiedResumeDep), e:
 			if isinstance(e, depgraph.UnsatisfiedResumeDep):