From b9fa198bec5d61fcc7bafd2a3e3062030bc71198 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 26 Sep 2009 00:01:19 +0000 Subject: Revert r14430 and fix to do as intended. Thanks to Arfrever for reporting. svn path=/main/trunk/; revision=14433 --- pym/portage/cache/sqlite.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pym') 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(): -- cgit v1.2.3-1-g7c22