From 0a0cff7f2f4782593b9bc66be5da5bbdba70439b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 21 Jan 2009 06:36:36 +0000 Subject: Inside depgraph.loadResumeCommand(), ignore unsatisified dependencies that are pulled in by installed packages. This is needed in order to avoid having --keep-going bail out needlessly when one of a group of circularly dependent packages fails to install after one or more of the group have already been installed. TODO: Add sanity checks to make sure that it's really safe to ignore all the deps that can be ignored by this code. svn path=/main/trunk/; revision=12541 --- pym/_emerge/__init__.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pym/_emerge') 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() -- cgit v1.2.3-1-g7c22