diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-01-21 22:49:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-01-21 22:49:42 +0000 |
| commit | ce7dfb9592312a1f286861bcf32f7a3a93581671 (patch) | |
| tree | a5ac79ad235874f631bd117656eb79a65d93842d | |
| parent | be4d34839c675c19e358d903e9322cad0bba5b05 (diff) | |
| download | portage-ce7dfb9592312a1f286861bcf32f7a3a93581671.tar.gz portage-ce7dfb9592312a1f286861bcf32f7a3a93581671.tar.bz2 portage-ce7dfb9592312a1f286861bcf32f7a3a93581671.zip | |
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).
svn path=/main/trunk/; revision=12543
| -rw-r--r-- | pym/_emerge/__init__.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 1252f3874..4292865fb 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -10867,7 +10867,7 @@ class Scheduler(PollScheduler): 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() @@ -13660,14 +13660,15 @@ def action_depclean(settings, trees, ldpath_mtimes, 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: @@ -13870,14 +13871,11 @@ def action_build(settings, trees, mtimedb, 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): |