summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-09-26 00:01:19 +0000
committerZac Medico <zmedico@gentoo.org>2009-09-26 00:01:19 +0000
commitb9fa198bec5d61fcc7bafd2a3e3062030bc71198 (patch)
tree2c6d68ee66ebeaf3d851f8cd99c69b78ef2368f8
parent51140af8783fae99ff2b2f5ca5f45bcfeb689b91 (diff)
downloadportage-b9fa198bec5d61fcc7bafd2a3e3062030bc71198.tar.gz
portage-b9fa198bec5d61fcc7bafd2a3e3062030bc71198.tar.bz2
portage-b9fa198bec5d61fcc7bafd2a3e3062030bc71198.zip
Revert r14430 and fix to do as intended. Thanks to Arfrever for reporting.v2.2_rc42
svn path=/main/trunk/; revision=14433
-rw-r--r--pym/portage/cache/sqlite.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/cache/sqlite.py b/pym/portage/cache/sqlite.py
index 0c23a78ae..b8136bb4f 100644
--- 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():