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 70BCE138CEE for ; Sun, 5 Jul 2015 12:10:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6C11E08F9; Sun, 5 Jul 2015 12:10:08 +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 65C6AE08F9 for ; Sun, 5 Jul 2015 12:10:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91D10340942 for ; Sun, 5 Jul 2015 12:10:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3DBC0739 for ; Sun, 5 Jul 2015 12:10:06 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1436098354.e3c23c8ed8ac697a9a8fccf8edc5ef850f6a94ac.blueness@gentoo> Subject: [gentoo-commits] proj/grss:master commit in: /, grs/ X-VCS-Repository: proj/grss X-VCS-Files: clean-worldconf grs/WorldConf.py X-VCS-Directories: / grs/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: e3c23c8ed8ac697a9a8fccf8edc5ef850f6a94ac X-VCS-Branch: master Date: Sun, 5 Jul 2015 12:10:06 +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: 104f973e-699c-4e76-adf5-b0859910c4bd X-Archives-Hash: fe50c026757583d5355e89c3457ace5f commit: e3c23c8ed8ac697a9a8fccf8edc5ef850f6a94ac Author: Anthony G. Basile gentoo org> AuthorDate: Sun Jul 5 12:12:34 2015 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sun Jul 5 12:12:34 2015 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=e3c23c8e clean-worldconf: remove try-except and fix typo. clean-worldconf | 4 +--- grs/WorldConf.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/clean-worldconf b/clean-worldconf index 1fd5da3..2e76f57 100755 --- a/clean-worldconf +++ b/clean-worldconf @@ -7,10 +7,8 @@ from grs import WorldConf def main(): WorldConf.clean() - try: + if os.path.isfile(CONST.PORTAGE_DIRTYFILE): os.remove(CONST.PORTAGE_DIRTYFILE) - except (FileNotFoundError, IsADirectoryError): - pass if __name__ == "__main__": main() diff --git a/grs/WorldConf.py b/grs/WorldConf.py index b9e9be9..481d3a3 100644 --- a/grs/WorldConf.py +++ b/grs/WorldConf.py @@ -98,7 +98,7 @@ class WorldConf(): continue fpath = os.path.join(CONST.PORTAGE_CONFIGDIR, 'package.env') - if os.path.isile(fpath): + if os.path.isfile(fpath): update = False with open(fpath, 'r') as g: lines = g.readlines()