PreservedLibsRegistry: try to parse as JSON first

diff --git a/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py b/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py
index d774f80678eeeabae1de8f6014f46c15e438926f..d3d100f187eb99b8818eece024d80b986f913245 100644 (file)
--- 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: