Skip to content

Commit d696b7f

Browse files
committed
fixup
1 parent 78534a9 commit d696b7f

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

mig/server/createuser.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,9 @@ def main(args, cwd, configuration=None, db_path=keyword_auto):
307307
if verbose:
308308
print('using user dict: %s' % user_dict)
309309
try:
310-
create_user(user_dict, conf_path, db_path, force, verbose, ask_renew,
311-
default_renew, verify_peer=peer_pattern,
310+
create_user(user_dict, conf_path, db_path, configuration, force, verbose, ask_renew,
311+
default_renew,
312+
verify_peer=peer_pattern,
312313
peer_expire_slack=slack_secs, ask_change_pw=ask_change_pw)
313314
if configuration.site_enable_gdp:
314315
(success_here, msg) = ensure_gdp_user(configuration,

mig/shared/useradm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ def upper_repl(match):
10361036
raise Exception('could not create custom css file: %s' % css_path)
10371037

10381038

1039-
def create_user(user, configuration, conf_path, db_path, force=False, verbose=False,
1039+
def create_user(user, conf_path, db_path, configuration=None, force=False, verbose=False,
10401040
ask_renew=True, default_renew=False, do_lock=True,
10411041
verify_peer=None, peer_expire_slack=0, from_edit_user=False,
10421042
ask_change_pw=False, auto_create_db=True, create_backup=True):
@@ -1045,7 +1045,7 @@ def create_user(user, configuration, conf_path, db_path, force=False, verbose=Fa
10451045
"""
10461046

10471047
if configuration is not None:
1048-
# ignore
1048+
# use it
10491049
pass
10501050
elif conf_path:
10511051
if isinstance(conf_path, basestring):

0 commit comments

Comments
 (0)