From 521f0739caae714edaebede89b7143c26330804b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 14 May 2011 21:29:48 -0700 Subject: 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 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 5db267d53..40f0cfb0f 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -815,15 +815,7 @@ class vardbapi(dbapi): """ myroot = None mycpv = None - locked_vdb = 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 = True + self.lock() try: counter = self.get_counter_tick_core() - 1 if self._cached_counter != counter: @@ -837,8 +829,7 @@ class vardbapi(dbapi): write_atomic(self._counter_path, str(counter)) self._cached_counter = counter finally: - if locked_vdb: - self.unlock() + self.unlock() return counter -- cgit v1.2.3-1-g7c22