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 1QKb9q-0003WC-Lq for garchives@archives.gentoo.org; Thu, 12 May 2011 19:02:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85A551C005; Thu, 12 May 2011 19:02:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 513161C005 for ; Thu, 12 May 2011 19:02:39 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF6391BC0DB for ; Thu, 12 May 2011 19:02:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 51C9880506 for ; Thu, 12 May 2011 19:02:38 +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: <5d76c94e173df56aafcc1a5a740c01ffc51f2f0b.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/porttree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5d76c94e173df56aafcc1a5a740c01ffc51f2f0b Date: Thu, 12 May 2011 19:02:38 +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: X-Archives-Hash: 44f38eb971c43977902384111aae3f64 commit: 5d76c94e173df56aafcc1a5a740c01ffc51f2f0b Author: Zac Medico gentoo org> AuthorDate: Thu May 12 19:02:27 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu May 12 19:02:27 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5d76c94e porttree: use pure volatile cache if necessary --- pym/portage/dbapi/porttree.py | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.p= y index 379cc68..a30c9d7 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -170,12 +170,18 @@ class portdbapi(dbapi): # to the cache entries/directories. if secpass < 1 or not depcachedir_w_ok: for x in self.porttrees: - db_ro =3D self.auxdbmodule(self.depcachedir, x, - filtered_auxdbkeys, gid=3Dportage_gid, readonly=3DTrue) - self.auxdb[x] =3D metadata_overlay.database( - self.depcachedir, x, filtered_auxdbkeys, - gid=3Dportage_gid, db_rw=3Dvolatile.database, - db_ro=3Ddb_ro) + try: + db_ro =3D self.auxdbmodule(self.depcachedir, x, + filtered_auxdbkeys, readonly=3DTrue, **cache_kwargs) + except CacheError: + self.auxdb[x] =3D volatile.database( + self.depcachedir, x, filtered_auxdbkeys, + **cache_kwargs) + else: + self.auxdb[x] =3D metadata_overlay.database( + self.depcachedir, x, filtered_auxdbkeys, + db_rw=3Dvolatile.database, db_ro=3Ddb_ro, + **cache_kwargs) else: for x in self.porttrees: if x in self.auxdb: