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>
This commit is contained in:
parent
9e48ce1f2e
commit
27e3099f40
|
@ -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:
|
||||
if rc[0] != 0:
|
||||
errorExit("sed error (" + str(rc[0]) + "): " + rc[1])
|
||||
return rc[1]+"\n"
|
||||
else:
|
||||
errorExit("sed error " + rc[1])
|
||||
|
||||
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,7 +243,6 @@ class selinuxConfig:
|
|||
break
|
||||
if exists == 1:
|
||||
return 1
|
||||
else:
|
||||
return 0
|
||||
|
||||
|
||||
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue