From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E1AD21387FD for ; Tue, 1 Apr 2014 16:39:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1881BE0ACD; Tue, 1 Apr 2014 16:38:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A11FDE0ABF for ; Tue, 1 Apr 2014 16:38:54 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D46CF33FD2C for ; Tue, 1 Apr 2014 16:38:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 70AA61890C for ; Tue, 1 Apr 2014 16:38:50 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1396370196.ea0f8cbcc126a53bc450b4161c8910fe1d9af778.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/util/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/util/fileio.py X-VCS-Directories: roverlay/util/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: ea0f8cbcc126a53bc450b4161c8910fe1d9af778 X-VCS-Branch: master Date: Tue, 1 Apr 2014 16:38:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4d2838f4-3a12-4a3e-9a64-b94bcf3f7666 X-Archives-Hash: 58bd64172c1e852dea49253dbdb2196b commit: ea0f8cbcc126a53bc450b4161c8910fe1d9af778 Author: André Erdmann mailerd de> AuthorDate: Mon Mar 31 18:30:18 2014 +0000 Commit: André Erdmann mailerd de> CommitDate: Tue Apr 1 16:36:36 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=ea0f8cbc fileio: catch EOFError --- roverlay/util/fileio.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roverlay/util/fileio.py b/roverlay/util/fileio.py index dc96119..804aa9f 100644 --- a/roverlay/util/fileio.py +++ b/roverlay/util/fileio.py @@ -76,7 +76,7 @@ def read_text_file ( filepath, preparse=None, try_harder=True ): # safely read first line only line = next ( creader ) - except StopIteration: + except ( StopIteration, EOFError ): # empty file (?) CH.close() return