Merged from trunk -r13887:13895
| 13888 | Fix a regression caused by the code from bug #278729, which |
| zmedico | causes incorrect preference evaluation for cases like |
| | kde-base/nepomuk: || ( |
| | >=dev-libs/soprano-2.3.0[clucene,dbus,raptor,redland] |
| | >=dev-libs/soprano-2.3.0[clucene,dbus,raptor,java] ) In |
| | cases like this we need to prefer the choice which is |
| | already satisfied by current USE configuration. Thanks to |
| | Maciej Mrozowski <reavertm@poczta.fm> for reporting. |
| 13889 | Bug #280259 - Use codecs.open() when reading the Packages |
| zmedico | file inside binarytree.inject(), in order to avoid a |
| | UnicodeDecodeError when the file is later written as a |
| | unicode stream (via atomic_ofstream). |
| 13890 | Bug #280259 - Fix binarytree to always open the Packages |
| zmedico | file as unicode. |
| 13891 | Bug #280259 - Fix emaint to call binarytree._load_pkgindex() |
| zmedico | for unicode handling. |
| 13892 | Fix dep_zapdeps exception 'ValueError: need more than 3 |
| zmedico | values to unpack' from r13888. |
| 13893 | In the dep_zapdeps() code from bug #278729, set |
| zmedico | all_use_satisfied = False if the choice includes an |
| | unavailable package. |
| 13894 | Revert the code from bug #278729 for now since it need to be |
| zmedico | redone in order to account for the issue described in |
| | comment #3. |
| 13895 | Bug #280320 - Fix broken _emerge.main ImportError handler.. |
| zmedico | |
svn path=/main/branches/prefix/; revision=13899
projects / portage.git / commit