From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SAjsL-00054h-H2 for garchives@archives.gentoo.org; Thu, 22 Mar 2012 15:24:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5372E072D; Thu, 22 Mar 2012 15:24:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A5877E072D for ; Thu, 22 Mar 2012 15:24:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E11151B4018 for ; Thu, 22 Mar 2012 15:24:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A3239E5403 for ; Thu, 22 Mar 2012 15:24:19 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1332429831.0b4cf4cc31684bd1800fd1588f7114d8fe45d137.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/util/_dyn_libs/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/util/_dyn_libs/PreservedLibsRegistry.py X-VCS-Directories: pym/portage/util/_dyn_libs/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 0b4cf4cc31684bd1800fd1588f7114d8fe45d137 X-VCS-Branch: master Date: Thu, 22 Mar 2012 15:24:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 2a275559-aa4a-4059-a0e6-42a70f3fe751 X-Archives-Hash: fd3b3dad4f5a028b9937bd8de22ff6c0 commit: 0b4cf4cc31684bd1800fd1588f7114d8fe45d137 Author: Zac Medico gentoo org> AuthorDate: Thu Mar 22 15:23:51 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Mar 22 15:23:51 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0b4cf4cc PreservedLibsRegistry: try to parse as JSON first --- .../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/po= rtage/util/_dyn_libs/PreservedLibsRegistry.py index d774f80..d3d100f 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 =3D pickle.loads(content) + self._data =3D json.loads(_unicode_decode(content, + encoding=3D_encodings['repo.content'], errors=3D'strict')) except SystemExit: raise except Exception as e: try: - self._data =3D json.loads(_unicode_decode(content, - encoding=3D_encodings['repo.content'], errors=3D'strict')) + self._data =3D pickle.loads(content) except SystemExit: raise except Exception: