Bugfix from refactoring

3 years ago · e9530eda9d
parent 130a4ed2d3
commit e9530eda9d
2 changed files with 3 additions and 4 deletions
--- 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:
--- 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):