joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add return codes

Browse Source
This commit is contained in:
Jakob Ketterl
2022-06-01 17:58:06 +02:00
parent be8e35cbcf
commit 08485f255a
4 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
owrx/admin/__init__.py
View File

@ -46,15 +46,14 @@ def run_admin_action(parser, args):
else:
if not hasattr(args, "silent") or not args.silent:
parser.print_help()
sys.exit(1)
sys.exit(0)
return 1
return 0
try:
command.run(args)
return command.run(args)
except Exception:
if not hasattr(args, "silent") or not args.silent:
print("Error running command:")
traceback.print_exc()
sys.exit(1)
sys.exit(0)
return 1
return 0

6
owrx/admin/commands.py
View File

@ -30,8 +30,7 @@ class UserCommand(Command, metaclass=ABCMeta):
password = getpass("Please enter the new password for {username}: ".format(username=username))
confirm = getpass("Please confirm the new password: ")
if password != confirm:
print("ERROR: Password mismatch.")
sys.exit(1)
raise ValueError("Password mismatch")
generated = False
return password, generated
@ -108,8 +107,9 @@ class HasUser(Command):
if args.user in userList:
if not args.silent:
print('User "{name}" exists.'.format(name=args.user))
return 0
else:
if not args.silent:
print('User "{name}" does not exist.'.format(name=args.user))
# in bash, a return code > 0 is interpreted as "false"
sys.exit(1)
return 1