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 1QLT0V-00043k-NL for garchives@archives.gentoo.org; Sun, 15 May 2011 04:32:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF6E5E0459; Sun, 15 May 2011 04:32:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7F1DDE0459 for ; Sun, 15 May 2011 04:32:35 +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 F1EC81B405E for ; Sun, 15 May 2011 04:32:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2082580504 for ; Sun, 15 May 2011 04:32:34 +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: <521f0739caae714edaebede89b7143c26330804b.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 521f0739caae714edaebede89b7143c26330804b Date: Sun, 15 May 2011 04:32:34 +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: 867d153e68e222a4f9f91d25ec3ad9f1 commit: 521f0739caae714edaebede89b7143c26330804b Author: Zac Medico gentoo org> AuthorDate: Sun May 15 04:29:48 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 15 04:29:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D521f0739 Revert "counter_tick_core: don't lock if parallel-install" This reverts commit 461564ae94ff936918eeaa18493bc1da3846796f. Disabling the lock here doesn't really make sense, and I'm still triggering EDEADLK is some other places. --- pym/portage/dbapi/vartree.py | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 5db267d..40f0cfb 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -815,15 +815,7 @@ class vardbapi(dbapi): """ myroot =3D None mycpv =3D None - locked_vdb =3D False - if "parallel-install" not in self.settings.features: - # If parallel-install is enabled, it's unsafe to - # lock the vdb here since the portage.locks module - # does not behave as desired if we try to lock the - # same file multiple times concurrently from the - # same process. - self.lock() - locked_vdb =3D True + self.lock() try: counter =3D self.get_counter_tick_core() - 1 if self._cached_counter !=3D counter: @@ -837,8 +829,7 @@ class vardbapi(dbapi): write_atomic(self._counter_path, str(counter)) self._cached_counter =3D counter finally: - if locked_vdb: - self.unlock() + self.unlock() =20 return counter =20