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 1Q3ZE7-00085n-It for garchives@archives.gentoo.org; Sat, 26 Mar 2011 19:32:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D5CE1C077; Sat, 26 Mar 2011 19:31:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4CACB1C077 for ; Sat, 26 Mar 2011 19:31:05 +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 036011B412E for ; Sat, 26 Mar 2011 19:31:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6BEF18006A for ; Sat, 26 Mar 2011 19:31:04 +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: <35faac42c5958278240ffe7cd3e88f1c050f404b.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:2.1.9 commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/PollScheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 35faac42c5958278240ffe7cd3e88f1c050f404b Date: Sat, 26 Mar 2011 19:31:04 +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: 0b83345036b80f17934c0c9e5a0bea9b commit: 35faac42c5958278240ffe7cd3e88f1c050f404b Author: Zac Medico gentoo org> AuthorDate: Fri Mar 25 15:57:10 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Mar 26 19:21:59 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D35faac42 PollScheduler: handle missing log directory This can be triggered by AbstractPollTask._log_poll_exception(), as reported by Michael Haubenwallner gentoo.org> for AIX. --- pym/_emerge/PollScheduler.py | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py index 8f4bd64..043f02a 100644 --- a/pym/_emerge/PollScheduler.py +++ b/pym/_emerge/PollScheduler.py @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 =20 import gzip +import errno import logging import select import time @@ -318,22 +319,32 @@ class PollScheduler(object): # (like for parallel-fetch), then use the global value. background =3D self._background =20 + msg_shown =3D False if not background: writemsg_level(msg, level=3Dlevel, noiselevel=3Dnoiselevel) + msg_shown =3D True =20 if log_path is not None: - f =3D open(_unicode_encode(log_path, - encoding=3D_encodings['fs'], errors=3D'strict'), - mode=3D'ab') - - if log_path.endswith('.gz'): - # NOTE: The empty filename argument prevents us from triggering - # a bug in python3 which causes GzipFile to raise AttributeError - # if fileobj.name is bytes instead of unicode. - f =3D gzip.GzipFile(filename=3D'', mode=3D'ab', fileobj=3Df) - - f.write(_unicode_encode(msg)) - f.close() + try: + f =3D open(_unicode_encode(log_path, + encoding=3D_encodings['fs'], errors=3D'strict'), + mode=3D'ab') + except IOError as e: + if e.errno not in (errno.ENOENT, errno.ESTALE): + raise + if not msg_shown: + writemsg_level(msg, level=3Dlevel, noiselevel=3Dnoiselevel) + else: + + if log_path.endswith('.gz'): + # NOTE: The empty filename argument prevents us from + # triggering a bug in python3 which causes GzipFile + # to raise AttributeError if fileobj.name is bytes + # instead of unicode. + f =3D gzip.GzipFile(filename=3D'', mode=3D'ab', fileobj=3Df) + + f.write(_unicode_encode(msg)) + f.close() =20 _can_poll_device =3D None =20