Commit e9530eda authored by Ozzie Isaacs's avatar Ozzie Isaacs

Bugfix from refactoring

parent 130a4ed2
...@@ -1579,7 +1579,7 @@ def import_ldap_users(): ...@@ -1579,7 +1579,7 @@ def import_ldap_users():
log.debug_or_exception(e) log.debug_or_exception(e)
continue continue
if user_data: if user_data:
user_count, message = ldap_import_create_user(user, user_data, showtext) user_count, message = ldap_import_create_user(user, user_data)
if message: if message:
showtext['text'] = message showtext['text'] = message
else: else:
......
...@@ -510,15 +510,14 @@ class Updater(threading.Thread): ...@@ -510,15 +510,14 @@ class Updater(threading.Thread):
# before major update # before major update
if i == (len(commit) - 1): if i == (len(commit) - 1):
i -= 1 i -= 1
status, parents = self._stable_updater_parse_major_version(self, status, parents = self._stable_updater_parse_major_version(commit,
commit,
i, i,
parents, parents,
current_version, current_version,
status) status)
break break
status = self._stable_updater_set_status(self, i, newer, status, parents, commit) status = self._stable_updater_set_status(i, newer, status, parents, commit)
return json.dumps(status) return json.dumps(status)
def _get_request_path(self): def _get_request_path(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment