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 1QPkUO-000597-8P for garchives@archives.gentoo.org; Fri, 27 May 2011 00:01:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E2C91C011; Fri, 27 May 2011 00:01:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EE17D1C011 for ; Fri, 27 May 2011 00:01:06 +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 81AF31B4033 for ; Fri, 27 May 2011 00:01:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9D84180505 for ; Fri, 27 May 2011 00:01:05 +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: <0431bac723806b2c5539f9d2b01a017f077d190a.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: 0431bac723806b2c5539f9d2b01a017f077d190a Date: Fri, 27 May 2011 00:01:05 +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: 80b4332a03ac4fc1244413cf6089fe1c commit: 0431bac723806b2c5539f9d2b01a017f077d190a Author: Zac Medico gentoo org> AuthorDate: Fri May 27 00:00:22 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri May 27 00:00:22 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0431bac7 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 976d8e3..982324c 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1684,19 +1684,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=3Dscheduler, 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 @@ -1746,8 +1744,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 [] @@ -1789,7 +1786,7 @@ class dblink(object): =20 self._elog_process(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) @@ -1800,7 +1797,7 @@ class dblink(object): settings=3Dself.settings) phase.start() retval =3D phase.wait() - finally: + finally: if builddir_lock is not None: builddir_lock.unlock() =20