From e9530eda9dbfeeef79e1d4f0356f1eaa61429016 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 21 Mar 2021 13:46:13 +0100 Subject: [PATCH] Bugfix from refactoring --- cps/admin.py | 2 +- cps/updater.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cps/admin.py b/cps/admin.py index e360d1d4..6cd04246 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -1579,7 +1579,7 @@ def import_ldap_users(): log.debug_or_exception(e) continue 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: showtext['text'] = message else: diff --git a/cps/updater.py b/cps/updater.py index 956ae33b..9fb85bf5 100644 --- a/cps/updater.py +++ b/cps/updater.py @@ -510,15 +510,14 @@ class Updater(threading.Thread): # before major update if i == (len(commit) - 1): i -= 1 - status, parents = self._stable_updater_parse_major_version(self, - commit, + status, parents = self._stable_updater_parse_major_version(commit, i, parents, current_version, status) 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) def _get_request_path(self):