Merged from trunk -r14432:14435
authorFabian Groffen <grobian@gentoo.org>
Sat, 26 Sep 2009 18:46:54 +0000 (18:46 -0000)
committerFabian Groffen <grobian@gentoo.org>
Sat, 26 Sep 2009 18:46:54 +0000 (18:46 -0000)
commit28079ad7564d72f2b5f51591c06cf630845eed39
tree2bf65e32166b6b8a8a2dd0c21a8fc2b23f8d1479
parent8249bd0e9293fecc5c5b3f1dd1b78e7f6ced3ad1
   Merged from trunk -r14432:14435

   | 14433   | Revert r14430 and fix to do as intended. Thanks to Arfrever  |
   | zmedico | for reporting.                                               |

   | 14435   | Bug #286475 - Fix KeyValuePairFileLoader.lineParser() so it  |
   | zmedico | doesn't raise AttributeError when a key/value is redefined.  |

svn path=/main/branches/prefix/; revision=14439
pym/portage/cache/sqlite.py
pym/portage/env/loaders.py