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

svn path=/main/trunk/; revision=14433

diff --git a/pym/portage/cache/sqlite.py b/pym/portage/cache/sqlite.py
index 0c23a78ae37239e8278fc39a94ec7bad6f6ec2b5..b8136bb4fd9fe64fb97c6344d4caec665b183103 100644 (file)
--- a/pym/portage/cache/sqlite.py
+++ b/pym/portage/cache/sqlite.py
@@ -33,7 +33,9 @@ class database(fs_template.FsBased):
 
        def __init__(self, *args, **config):
                super(database, self).__init__(*args, **config)
-               self._allowed_keys = ["_mtime_", "_eclasses_"] + self._known_keys
+               self._allowed_keys = ["_mtime_", "_eclasses_"]
+               self._allowed_keys.extend(self._known_keys)
+               self._allowed_keys.sort()
                self.location = os.path.join(self.location, 
                        self.label.lstrip(os.path.sep).rstrip(os.path.sep))
 
@@ -103,7 +105,7 @@ class database(fs_template.FsBased):
                self._db_table["packages"]["create"] = " ".join(create_statement)
                self._db_table["packages"]["columns"] = \
                        self._db_table["packages"]["internal_columns"] + \
-                       sorted(self._allowed_keys)
+                       self._allowed_keys
 
                cursor = self._db_cursor
                for k, v in self._db_table.items():