Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/grss:master commit in: /, grs/
Date: Sun, 05 Jul 2015 12:10:31
Message-Id: 1436098354.e3c23c8ed8ac697a9a8fccf8edc5ef850f6a94ac.blueness@gentoo
1 commit: e3c23c8ed8ac697a9a8fccf8edc5ef850f6a94ac
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 5 12:12:34 2015 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 5 12:12:34 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=e3c23c8e
7
8 clean-worldconf: remove try-except and fix typo.
9
10 clean-worldconf | 4 +---
11 grs/WorldConf.py | 2 +-
12 2 files changed, 2 insertions(+), 4 deletions(-)
13
14 diff --git a/clean-worldconf b/clean-worldconf
15 index 1fd5da3..2e76f57 100755
16 --- a/clean-worldconf
17 +++ b/clean-worldconf
18 @@ -7,10 +7,8 @@ from grs import WorldConf
19
20 def main():
21 WorldConf.clean()
22 - try:
23 + if os.path.isfile(CONST.PORTAGE_DIRTYFILE):
24 os.remove(CONST.PORTAGE_DIRTYFILE)
25 - except (FileNotFoundError, IsADirectoryError):
26 - pass
27
28 if __name__ == "__main__":
29 main()
30
31 diff --git a/grs/WorldConf.py b/grs/WorldConf.py
32 index b9e9be9..481d3a3 100644
33 --- a/grs/WorldConf.py
34 +++ b/grs/WorldConf.py
35 @@ -98,7 +98,7 @@ class WorldConf():
36 continue
37
38 fpath = os.path.join(CONST.PORTAGE_CONFIGDIR, 'package.env')
39 - if os.path.isile(fpath):
40 + if os.path.isfile(fpath):
41 update = False
42 with open(fpath, 'r') as g:
43 lines = g.readlines()