diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 03:20:18 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 03:20:18 +0000 |
commit | cf80605e9a065ed0f622855a01444094977764ed (patch) | |
tree | 51cfc68c8f6b6c551d29c07d26e4382ccf2e73bc | |
parent | ce06d043f12798f3f85b6c8647d1de31c37ee431 (diff) | |
download | portage-cf80605e9a065ed0f622855a01444094977764ed.tar.gz portage-cf80605e9a065ed0f622855a01444094977764ed.tar.bz2 portage-cf80605e9a065ed0f622855a01444094977764ed.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). (trunk r12543)
svn path=/main/branches/2.1.6/; revision=12829
-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 b52dba05d..0fabdbfeb 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -10851,7 +10851,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() @@ -13306,14 +13306,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: @@ -13516,14 +13517,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): |