Merged from trunk -r15166:15169
authorFabian Groffen <grobian@gentoo.org>
Tue, 5 Jan 2010 19:26:14 +0000 (19:26 -0000)
committerFabian Groffen <grobian@gentoo.org>
Tue, 5 Jan 2010 19:26:14 +0000 (19:26 -0000)
commitc5d33cc13801726cf5d23e04a01303b2036d3864
treede38b8ae2578e1796fee7a8d7ebb09fbef4d3351
parentb4c8f02bf38a2c112b374539b54c9dc0188edb35
   Merged from trunk -r15166:15169

   | 15167   | Rearrange _selinux ImportError handling so the workaround    |
   | zmedico | for bug #298310 isn't necessary.                             |

   | 15168   | Handle AttributeError inside atomic_ofstream.__del__. Thanks |
   | zmedico | to Cardoe for reporting.                                     |

   | 15169   | In python-2.x, convert PortageException.value attribute from |
   | zmedico | unicode to str in order to avoid empty output with string    |
   |         | format operator.                                             |

svn path=/main/branches/prefix/; revision=15171
pym/portage/__init__.py
pym/portage/exception.py
pym/portage/util.py