diff options
| author |   Christian Göttsche <cgzones@googlemail.com> | 2021-01-31 21:50:25 +0100 |
|---|---|---|
| committer |   Jason Zaman <perfinion@gentoo.org> | 2021-02-06 12:54:11 -0800 |
| commit | 607c61b089898d26c00af42a887cd1f24372be4d (patch) | |
| tree | 235ec0901bc0998ca5cd05210a56b5a25d13c726 | |
| parent | genhomedircon: generate file contexts for %{USERNAME} and %{USERID} (diff) | |
| download | hardened-refpolicy-607c61b089898d26c00af42a887cd1f24372be4d.tar.gz hardened-refpolicy-607c61b089898d26c00af42a887cd1f24372be4d.tar.bz2 hardened-refpolicy-607c61b089898d26c00af42a887cd1f24372be4d.zip | |
genhomedircon: misc pylint cleanup
support/genhomedircon.py:297:5: R1714: Consider merging these comparisons with "in" to "o in ('--type', '-t')" (consider-using-in)
support/genhomedircon.py:299:5: R1714: Consider merging these comparisons with "in" to "o in ('--nopasswd', '-n')" (consider-using-in)
support/genhomedircon.py:301:5: R1714: Consider merging these comparisons with "in" to "o in ('--dir', '-d')" (consider-using-in)
support/genhomedircon.py:238:2: R1705: Unnecessary "else" after "return" (no-else-return)
support/genhomedircon.py:207:11: C0201: Consider iterating the dictionary directly instead of calling .keys() (consider-iterating-dictionary)
support/genhomedircon.py:146:2: R1705: Unnecessary "else" after "return" (no-else-return)
support/genhomedircon.py:144:1: R1710: Either all return statements in a function should return an expression, or none of them should. (inconsistent-return-statements)
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Signed-off-by: Jason Zaman <perfinion@gentoo.org>
| -rw-r--r-- | support/genhomedircon.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/support/genhomedircon.py b/support/genhomedircon.py index 0490f724b..e4475f5c7 100644 --- a/support/genhomedircon.py +++ b/support/genhomedircon.py @@ -143,10 +143,9 @@ class selinuxConfig: def getHomeRootContext(self, homedir): rc=getstatusoutput("grep HOME_ROOT %s | sed -e \"s|^HOME_ROOT|%s|\"" % ( self.getHomeDirTemplate(), homedir)) - if rc[0] == 0: - return rc[1]+"\n" - else: - errorExit("sed error " + rc[1]) + if rc[0] != 0: + errorExit("sed error (" + str(rc[0]) + "): " + rc[1]) + return rc[1]+"\n" def getUsersFile(self): return self.selinuxdir+self.setype+"/users/local.users" @@ -211,7 +210,7 @@ class selinuxConfig: users = self.getUsers() ret="" # Fill in HOME and ROLE for users that are defined - for u in users.keys(): + for u in users: ret += self.getHomeDirContext (u, users[u]["home"], users[u]["role"], users[u]["name"], users[u]["uid"]) return ret+"\n" @@ -244,8 +243,7 @@ class selinuxConfig: break if exists == 1: return 1 - else: - return 0 + return 0 def getHomeDirs(self): @@ -301,11 +299,11 @@ try: 'nopasswd', 'dir=']) for o,a in gopts: - if o == '--type' or o == "-t": + if o in ('--type', '-t'): setype=a - if o == '--nopasswd' or o == "-n": + if o in ('--nopasswd', '-n'): usepwd=0 - if o == '--dir' or o == "-d": + if o in ('--dir', '-d'): directory=a if o == '--help': usage() |