diff options
| -rw-r--r-- | pym/_emerge/__init__.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 478faf235..5802b1396 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -8514,13 +8514,19 @@ class depgraph(object): # masked. if not self._create_graph(allow_unsatisfied=True): return False - if masked_tasks or self._unsatisfied_deps: + + # TODO: Add sanity checks to make sure that it's really + # safe to ignore all the deps that can be ignored here. + unsatisfied_deps = [x for x in self._unsatisfied_deps \ + if isinstance(x.parent, Package) and \ + x.parent.operation == "merge"] + if masked_tasks or unsatisfied_deps: # This probably means that a required package # was dropped via --skipfirst. It makes the # resume list invalid, so convert it to a # UnsatisfiedResumeDep exception. raise self.UnsatisfiedResumeDep(self, - masked_tasks + self._unsatisfied_deps) + masked_tasks + unsatisfied_deps) self._serialized_tasks_cache = None try: self.altlist() |