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 <gentoo-commits+bounces-347990-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QPkYW-0005fA-4a
for garchives@archives.gentoo.org; Fri, 27 May 2011 00:05:32 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 808131C041;
Fri, 27 May 2011 00:05:24 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 508DC1C041
for <gentoo-commits@lists.gentoo.org>; Fri, 27 May 2011 00:05:24 +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 D71931B400C
for <gentoo-commits@lists.gentoo.org>; Fri, 27 May 2011 00:05:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 4247B80505
for <gentoo-commits@lists.gentoo.org>; Fri, 27 May 2011 00:05:23 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <a18beb8fba56bfb21478d954e9b8f5dcce1a2c5d.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:2.1.9 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: a18beb8fba56bfb21478d954e9b8f5dcce1a2c5d
Date: Fri, 27 May 2011 00:05:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 93cc659b335e2c38f1242ff74f0cfc05
commit: a18beb8fba56bfb21478d954e9b8f5dcce1a2c5d
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri May 27 00:00:22 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri May 27 00:05:00 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Da18beb8f
unmerge: remove redundant builddir_locked var
---
pym/portage/dbapi/vartree.py | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 5394895..0ff2f7d 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1642,19 +1642,17 @@ class dblink(object):
self._prune_plib_registry(unmerge=3DTrue, needed=3Dneeded,
preserve_paths=3Dpreserve_paths)
=20
- builddir_locked =3D "PORTAGE_BUILDIR_LOCKED" in self.settings
builddir_lock =3D None
scheduler =3D self._scheduler
retval =3D os.EX_OK
try:
# Only create builddir_lock if the caller
# has not already acquired the lock.
- if not builddir_locked:
+ if "PORTAGE_BUILDIR_LOCKED" not in self.settings:
builddir_lock =3D EbuildBuildDir(
scheduler=3D(scheduler or PollScheduler().sched_iface),
settings=3Dself.settings)
builddir_lock.lock()
- builddir_locked =3D True
prepare_build_dirs(settings=3Dself.settings, cleanup=3DTrue)
log_path =3D self.settings.get("PORTAGE_LOG_FILE")
=20
@@ -1700,8 +1698,7 @@ class dblink(object):
=20
finally:
self.vartree.dbapi._bump_mtime(self.mycpv)
- if builddir_locked:
- try:
+ try:
if not eapi_unsupported and os.path.isfile(myebuildpath):
if retval !=3D os.EX_OK:
msg_lines =3D []
@@ -1745,7 +1742,7 @@ class dblink(object):
elog_process(self.mycpv, self.settings,
phasefilter=3D('prerm', 'postrm'))
=20
- if retval =3D=3D os.EX_OK and builddir_locked:
+ if retval =3D=3D os.EX_OK:
try:
doebuild_environment(myebuildpath, "cleanrm",
settings=3Dself.settings, db=3Dself.vartree.dbapi)
@@ -1757,7 +1754,7 @@ class dblink(object):
scheduler.dblinkEbuildPhase(
self, self.vartree.dbapi,
myebuildpath, "cleanrm")
- finally:
+ finally:
if builddir_lock is not None:
builddir_lock.unlock()
=20