System: Improved return calls at remove_user

feature-admin-split
Darksider3 5 years ago
parent 7d5ef3b493
commit b4d4fd9ad4

@ -50,6 +50,7 @@ class System:
:raises: :raises:
lib.UserExceptions.UserExistsAlready: when username specified already exists on the system lib.UserExceptions.UserExistsAlready: when username specified already exists on the system
""" """
create_command = cc create_command = cc
cc = create_command + tuple([username]) cc = create_command + tuple([username])
if self.dry: if self.dry:
@ -128,6 +129,7 @@ class System:
:type ssh_dir: str :type ssh_dir: str
:return: None :return: None
""" """
with open(ssh_dir + "authorized_keys", "w") as f: with open(ssh_dir + "authorized_keys", "w") as f:
print(key, file=f) print(key, file=f)
f.close() f.close()
@ -218,10 +220,13 @@ class System:
self.printTuple(cc) self.printTuple(cc)
return True return True
else: else:
ret = subprocess.call(cc) ret = subprocess.Popen(cc, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if ret != 0 and ret != 6: ret.wait() # wait for cc
stdio, err_io = ret.communicate() # get stdout as well as stderr
if ret.returncode != 0 and ret.returncode != 6: # userdel returns 6 when no mail dir was found but success
raise lib.UserExceptions.UnknownReturnCode( raise lib.UserExceptions.UnknownReturnCode(
f"Could not delete user with command {cc}. Return code: {ret}") f"Could not delete user with command {cc}. Return code: {ret.returncode},"
f" stdout/stderr: {stdio+err_io}")
return True return True

Loading…
Cancel
Save