diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-05-03 02:24:40 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-03 02:24:40 +0000 |
| commit | d0f560e778412c16cfd62b2dbe1ad024c3c77f4b (patch) | |
| tree | 0865bdd39d7e7e62667fb94eff9441c73f8597f4 | |
| parent | Add --nodeps to the parallel-fetch --resume options since recalculation of (diff) | |
| download | portage-multirepo-d0f560e778412c16cfd62b2dbe1ad024c3c77f4b.tar.gz portage-multirepo-d0f560e778412c16cfd62b2dbe1ad024c3c77f4b.tar.bz2 portage-multirepo-d0f560e778412c16cfd62b2dbe1ad024c3c77f4b.zip | |
Delete the resume list(s) if there is an unsatisfied block.
svn path=/main/trunk/; revision=10117
| -rw-r--r-- | pym/_emerge/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 73fd3a2f..f09d8210 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -7669,12 +7669,14 @@ def action_build(settings, trees, mtimedb, if show_spinner: print "\b\b... done!" + unsatisfied_block = False if success: mymergelist = mydepgraph.altlist() if mymergelist and \ (isinstance(mymergelist[-1], Blocker) and \ not mymergelist[-1].satisfied): if not fetchonly and not pretend: + unsatisfied_block = True mydepgraph.display( mydepgraph.altlist(reversed=tree), favorites=favorites) @@ -7682,11 +7684,11 @@ def action_build(settings, trees, mtimedb, print "!!! at the same time on the same system." if not quiet: show_blocker_docs_link() - return 1 if not success: mydepgraph.display_problems() + if unsatisfied_block or not success: # delete the current list and also the backup # since it's probably stale too. for k in ("resume", "resume_backup"): |