Merged from trunk -r14127:14130
authorFabian Groffen <grobian@gentoo.org>
Mon, 24 Aug 2009 09:42:25 +0000 (09:42 -0000)
committerFabian Groffen <grobian@gentoo.org>
Mon, 24 Aug 2009 09:42:25 +0000 (09:42 -0000)
commitb1fa05115acb2d860116c0a0d486ede15ac2a0f7
treef644c975b8d251671c1eb804ac3bfb7b0369d85a
parent77ee75ac9a3e07b9843dfbdcfab4a6429f643b44
   Merged from trunk -r14127:14130

   | 14128   | Make Scheduler._choose_pkg() prefer uninstall operations     |
   | zmedico | when available.                                              |

   | 14129   | In Scheduler._schedule_tasks_imp(), add uninstall operations |
   | zmedico | to the front of the merge queue.                             |

   | 14130   | Bug #282306 - Inside dblink._find_libs_to_preserve(), fall   |
   | zmedico | back to utf_8 encoding if a path cannot be encoded under the |
   |         | user's chosen encoding. This fixes the traceback shown in    |
   |         | bug 282115, comment #6.                                      |

svn path=/main/branches/prefix/; revision=14145
pym/_emerge/Scheduler.py
pym/portage/dbapi/vartree.py