Merged from trunk -r14422:14432
authorFabian Groffen <grobian@gentoo.org>
Sat, 26 Sep 2009 18:46:04 +0000 (18:46 -0000)
committerFabian Groffen <grobian@gentoo.org>
Sat, 26 Sep 2009 18:46:04 +0000 (18:46 -0000)
commit8249bd0e9293fecc5c5b3f1dd1b78e7f6ced3ad1
tree5208b35d285eee62e9eaff5c8f7852dd764b8bbe
parent33de25d55e71c680f3fecee0348f306cd25ad198
   Merged from trunk -r14422:14432

   | 14423    | Add a test case for this issue:                             |
   | zmedico  | http://bugs.python.org/issue5334                            |

   | 14424    | Fix length calculation so it doesn't assume the length of   |
   | zmedico  | the encoded string is the same as the unicode string.       |

   | 14425    | Remove unused imports.                                      |
   | zmedico  |                                                             |

   | 14426    | Use imp.reload() instead of reload() for compatibility with |
   | arfrever | Python 3.                                                   |

   | 14427    | Define __bool__() for compatibility with Python 3.          |
   | arfrever |                                                             |

   | 14428    | Remove ugly code from __len__, since defining __bool__      |
   | zmedico  | fixes the same issue.                                       |

   | 14429    | Fix formatting of sizes with Python 3.                      |
   | arfrever |                                                             |

   | 14430    | Make sure self._allowed_keys are sorted in the table create |
   | zmedico  | statement. They already are sorted, but do it explicitly    |
   |          | here for clarity.                                           |

   | 14431    | Fix UnboundLocalError triggered by atom without category    |
   | zmedico  | for nonexistent package. Thanks to Jeremy Olexa             |
   |          | <darkside@gentoo.org> for reporting.                        |

   | 14432    | Bug #285767 - Add support to to identify and eliminate      |
   | zmedico  | redundant package selections when multiple atoms happen to  |
   |          | specify a version range.                                    |

svn path=/main/branches/prefix/; revision=14438
12 files changed:
bin/ebuild
bin/repoman
pym/_emerge/Dependency.py
pym/_emerge/SequentialTaskQueue.py
pym/_emerge/depgraph.py
pym/_emerge/search.py
pym/portage/cache/sqlite.py
pym/portage/dep.py
pym/portage/proxy/objectproxy.py
pym/portage/sets/base.py
pym/portage/tests/ebuild/test_array_fromfile_eof.py [new file with mode: 0644]
pym/portage/tests/ebuild/test_pty_eof.py