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 1RRUJ8-0004cE-Nz for garchives@archives.gentoo.org; Fri, 18 Nov 2011 19:41:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D67A21C03E; Fri, 18 Nov 2011 19:40:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2022621C03E for ; Fri, 18 Nov 2011 19:40:59 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 58CDE1B4025 for ; Fri, 18 Nov 2011 19:40:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7714780042 for ; Fri, 18 Nov 2011 19:40:57 +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: <0a0670ed7e600d9dbdb2fc77d6f1f5da741f2592.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Scheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 0a0670ed7e600d9dbdb2fc77d6f1f5da741f2592 Date: Fri, 18 Nov 2011 19:40:57 +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: 4984da2d-0d42-4f85-89bb-ed9b46f74611 X-Archives-Hash: 53fbbb19e90b2e716fab9d5f3d9a26e6 commit: 0a0670ed7e600d9dbdb2fc77d6f1f5da741f2592 Author: Zac Medico gentoo org> AuthorDate: Fri Nov 18 19:40:48 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Nov 18 19:40:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0a0670ed Schduler: _check_temp_dir in _handle_self_update --- pym/_emerge/Scheduler.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index ad1a944..26c3794 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -290,7 +290,7 @@ class Scheduler(PollScheduler): def _handle_self_update(self): =20 if self._opts_no_self_update.intersection(self.myopts): - return + return os.EX_OK =20 for x in self._mergelist: if not isinstance(x, Package): @@ -307,9 +307,14 @@ class Scheduler(PollScheduler): '9999' in x.cpv or \ 'git' in x.inherited or \ 'git-2' in x.inherited: + rval =3D _check_temp_dir(self.settings) + if rval !=3D os.EX_OK: + return rval _prepare_self_update(self.settings) break =20 + return os.EX_OK + def _terminate_tasks(self): self._status_display.quiet =3D True while self._running_tasks: @@ -961,7 +966,9 @@ class Scheduler(PollScheduler): except self._unknown_internal_error: return 1 =20 - self._handle_self_update() + rval =3D self._handle_self_update() + if rval !=3D os.EX_OK: + return rval =20 for root in self.trees: root_config =3D self.trees[root]["root_config"]