diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-03-22 08:23:51 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-03-22 08:23:51 -0700 |
| commit | 0b4cf4cc31684bd1800fd1588f7114d8fe45d137 (patch) | |
| tree | 7a5b48cb0b7b047350a4e24e1cf30091b45f920c | |
| parent | 716b1864e03212b09f94ddf3573fbfa451473558 (diff) | |
| download | portage-0b4cf4cc31684bd1800fd1588f7114d8fe45d137.tar.gz portage-0b4cf4cc31684bd1800fd1588f7114d8fe45d137.tar.bz2 portage-0b4cf4cc31684bd1800fd1588f7114d8fe45d137.zip | |
PreservedLibsRegistry: try to parse as JSON first
| -rw-r--r-- | pym/portage/util/_dyn_libs/PreservedLibsRegistry.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py b/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py index d774f8067..d3d100f18 100644 --- a/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py +++ b/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py @@ -92,13 +92,13 @@ class PreservedLibsRegistry(object): # content is empty if it's an empty lock file if content: try: - self._data = pickle.loads(content) + self._data = json.loads(_unicode_decode(content, + encoding=_encodings['repo.content'], errors='strict')) except SystemExit: raise except Exception as e: try: - self._data = json.loads(_unicode_decode(content, - encoding=_encodings['repo.content'], errors='strict')) + self._data = pickle.loads(content) except SystemExit: raise except Exception: |