mirror of
https://github.com/YunoHost/moulinette.git
synced 2024-09-03 20:06:31 +02:00
admin-password argument
This commit is contained in:
parent
bb4a1065fe
commit
98ada0253e
1 changed files with 14 additions and 1 deletions
15
parse_args
15
parse_args
|
@ -164,6 +164,15 @@ def main():
|
||||||
with open('action_map.yml') as f:
|
with open('action_map.yml') as f:
|
||||||
action_map = yaml.load(f)
|
action_map = yaml.load(f)
|
||||||
|
|
||||||
|
admin_password_provided = False
|
||||||
|
|
||||||
|
for key, arg in enumerate(sys.argv):
|
||||||
|
if arg == '--admin-password':
|
||||||
|
admin_password_provided = True
|
||||||
|
admin_password = sys.argv[key+1]
|
||||||
|
sys.argv.pop(key)
|
||||||
|
sys.argv.pop(key)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
args = parse_dict(action_map)
|
args = parse_dict(action_map)
|
||||||
args_dict = vars(args).copy()
|
args_dict = vars(args).copy()
|
||||||
|
@ -173,7 +182,11 @@ def main():
|
||||||
args_dict[sanitized_key] = args_dict[key]
|
args_dict[sanitized_key] = args_dict[key]
|
||||||
del args_dict[key]
|
del args_dict[key]
|
||||||
del args_dict['func']
|
del args_dict['func']
|
||||||
result = args.func(**args_dict)
|
if admin_password_provided:
|
||||||
|
with YunoHostLDAP(password=admin_password):
|
||||||
|
result = args.func(**args_dict)
|
||||||
|
else:
|
||||||
|
result = args.func(**args_dict)
|
||||||
except TypeError, error:
|
except TypeError, error:
|
||||||
if not __debug__ :
|
if not __debug__ :
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
|
|
Loading…
Add table
Reference in a new issue