From 28079ad7564d72f2b5f51591c06cf630845eed39 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 26 Sep 2009 18:46:54 +0000 Subject: [PATCH] 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 | 6 ++++-- pym/portage/env/loaders.py | 5 +---- 2 files changed, 5 insertions(+), 6 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(): diff --git a/pym/portage/env/loaders.py b/pym/portage/env/loaders.py index 60e0e1b11..0dc4d75be 100644 --- a/pym/portage/env/loaders.py +++ b/pym/portage/env/loaders.py @@ -317,7 +317,4 @@ class KeyValuePairFileLoader(FileLoader): _("Value validation failed at line: %s, data %s") % (line_num + 1, value)) return - if key in data: - data[key].append(value) - else: - data[key] = value + data[key] = value -- 2.26.2