Merged from trunk 10091:10124

   Merged from trunk 10091:10124

   | 10092   | Clean up merge list handling: * In                           |
   | zmedico | depgraph.loadResumeCommand(), populate                       |
   |         | _serialized_tasks_cache so that it can be returned from      |
   |         | depgraph.altlist(). * Handle --skipfirst instide             |
   |         | depgraph.loadResumeCommand(), and fix it to skip the first   |
   |         | "merge" task and never skip "uninstall" tasks. * Always get  |
   |         | the merge list from depgraph.altlist() instead of using the  |
   |         | mtimedb directly. The list returned from depgraph.altlist()  |
   |         | contains Package instances with cached metadata. * Remove    |
   |         | obsolete code from depgraph.display() and MergeTask.merge()  |
   |         | since the merge list always comes from depgraph.altlist()    |
   |         | now, and never directly from the mtimedb.                    |

   | 10094   | Validate resume list data some more.                         |
   | zmedico |                                                              |

   | 10096   | In depgraph._complete_graph(), use cached Package instances  |
   | zmedico | instead of constructing new ones.                            |

   | 10098   | In depgraph._serialize_tasks(), filter "nomerge" nodes at a  |
   | zmedico | more appropriate place.                                      |

   | 10100   | Use Package instance attributes to clean up and simplify     |
   | zmedico | depgraph.validate_blockers().                                |

   | 10102   | Use Package.cp attribute instead of calling cpv_getkey().    |
   | zmedico |                                                              |

   | 10104   | When searching for a "sys-apps/portage" installation task,   |
   | zmedico | use match_pkgs() instead of sequential search.               |

   | 10106   | In depgraph.validate_blockers(), discard any "uninstall"     |
   | zmedico | tasks scheduled by previous calls, since those tasks may not |
   |         | make sense given the current graph state.                    |

   | 10108   | Move the blocker cache validation into                       |
   | zmedico | depgraph.validate_blockers().                                |

   | 10110   | Use match_pkgs() to simplify package comparison.             |
   | zmedico |                                                              |

   | 10112   | Add a PackageVirtualDbapi.__iter__() method and use it to    |
   | zmedico | iterate over all installed packages in                       |
   |         | depgraph.validate_blockers().                                |

   | 10114   | * Check for masked packages in the --resume merge list and   |
   | zmedico | bail out in that case (bug #199408). * In                    |
   |         | depgraph.loadResumeCommand(), create a dependency graph from |
   |         | the resume list. This ensures that the merge list has it's   |
   |         | dependencies satisfied. It also enables --tree display       |
   |         | together with --resume.                                      |

   | 10115   | Fix --resume mode to check for unsatisfied blockers and bail |
   | zmedico | out when necessary.                                          |

   | 10116   | Add --nodeps to the parallel-fetch --resume options since    |
   | zmedico | recalculation of deps is a a waste here.                     |

   | 10117   | Delete the resume list(s) if there is an unsatisfied block.  |
   | zmedico |                                                              |

   | 10119   | Fix depgraph.loadResumeCommand() to identify an unsatisfied  |
   | zmedico | dependency and invalidate the resume list in that case.      |

   | 10121   | Make --nodepa automatically disable --tree.                  |
   | zmedico |                                                              |

   | 10123   | Move --resume options handling to the beginning of           |
   | zmedico | action_build() so that the current options are updated with  |
   |         | the saved options as soon as possible.                       |

   | 10124   | Also move mtimedb resume list validation earlier.            |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=10168