Merged from trunk -r12133:12146

   Merged from trunk -r12133:12146

   | 12134   | Source bashrc files as late as possible, giving them the     |
   | zmedico | opportunity to override as much as possible. Thanks to Ned   |
   |         | Ludd <solar@g.o> for the suggestion.                         |

   | 12136   | Skip sourcinf of profile.bashrc during the depend phase.     |
   | zmedico |                                                              |

   | 12138   | Fix depgraph._dep_check_composite_db._visible() to reject    |
   | zmedico | installed packages that are masked. This is necessary for    |
   |         | correct choices in || deps when we want to ensure that       |
   |         | installed masked packages are not preferred over other       |
   |         | available choices that are not masked. Thanks to Jan         |
   |         | Kundrát <jkt@g.o> for reporting this issue and testing the  |
   |         | patch.                                                       |

   | 12140   | When calling `git ls-files -m` to list modified files, use   |
   | zmedico | --with-tree=HEAD so that differences from the most recent    |
   |         | commit are given instead of differences from the index which |
   |         | is used for commit staging purposes. This is required since  |
   |         | otherwise files that have been added via `git add` (such as  |
   |         | echangelog does with the ChangeLog) won't show up in the     |
   |         | list of modified files due to being unmodified relative to   |
   |         | the index. Thanks to Christian Ruppert (idl0r) for           |
   |         | reporting.                                                   |

   | 12142   | It's not safe to use the git commit -a option since there    |
   | zmedico | might be some modified files elsewhere in the working tree   |
   |         | that the user doesn't want to commit. Therefore, call git    |
   |         | update-index in order to ensure that the index is updated    |
   |         | with the latest versions of all new and modified files in    |
   |         | the relevant portion of the working tree.                    |

   | 12144   | When --keep-going drops packages due to unsatisfied          |
   | zmedico | dependencies, include them in the list of packgaes that      |
   |         | "failed to build or install" that's displayed at the end.    |

   | 12146   | Break references between the depgraph and the dropped tasks  |
   | zmedico | inside Scheduler._calc_resume_list(), since the tasks are    |
   |         | now saved for display at the end.                            |

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