From 46d6fab07b300439fc011e004710937a1a971143 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 3 Dec 2022 14:11:53 +0100 Subject: [PATCH 1/4] Fix again the legacy patch for yunohost user create @_@ --- src/utils/legacy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/legacy.py b/src/utils/legacy.py index 35112724f..3334632c2 100644 --- a/src/utils/legacy.py +++ b/src/utils/legacy.py @@ -254,8 +254,8 @@ def _patch_legacy_helpers(app_folder): "yunohost tools port-available": {"important": True}, "yunohost app checkurl": {"important": True}, "yunohost user create": { - "pattern": r"yunohost user create \S+ (-f|--firstname) (\S+) (-l|--lastname) \S+ (.*)", - "replace": r"yunohost user create --fullname \2 \4", + "pattern": r"yunohost user create (\S+) (-f|--firstname) (\S+) (-l|--lastname) \S+ (.*)", + "replace": r"yunohost user create \1 --fullname \3 \5", "important": False, }, # Remove From 4b9e26b974b0cc8f7aa44fd773537508316b8ba6 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 3 Dec 2022 14:13:38 +0100 Subject: [PATCH 2/4] Update changelog for 11.1.1.1 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index fb48eeed8..d80941e91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yunohost (11.1.1.1) testing; urgency=low + + - Fix again the legacy patch for yunohost user create @_@ (46d6fab0) + + -- Alexandre Aubin Sat, 03 Dec 2022 14:13:09 +0100 + yunohost (11.1.1) testing; urgency=low - groups: add mail-aliases management (#1539) (0f9d9388) From 1cb5e43e7eb50356078411088b5d7cbf99224744 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 3 Dec 2022 15:56:41 +0100 Subject: [PATCH 3/4] group mailalias: the ldap class is in fact mailGroup, not mailAccount -_- --- src/user.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/user.py b/src/user.py index 2fcd8ab9f..8cf79c75f 100644 --- a/src/user.py +++ b/src/user.py @@ -1242,11 +1242,11 @@ def user_group_update( logger.info(m18n.n("group_update_aliases", group=groupname)) new_attr_dict["mail"] = set(new_group_mail) - if new_attr_dict["mail"] and "mailAccount" not in group["objectClass"]: - new_attr_dict["objectClass"] = group["objectClass"] + ["mailAccount"] - elif not new_attr_dict["mail"] and "mailAccount" in group["objectClass"]: + if new_attr_dict["mail"] and "mailGroup" not in group["objectClass"]: + new_attr_dict["objectClass"] = group["objectClass"] + ["mailGroup"] + if not new_attr_dict["mail"] and "mailGroup" in group["objectClass"]: new_attr_dict["objectClass"] = [ - c for c in group["objectClass"] if c != "mailAccount" + c for c in group["objectClass"] if c != "mailGroup" and c != "mailAccount" ] if new_attr_dict: From 3ff2d4688938f61e65ea56c8150dd2c6a8e6c761 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 3 Dec 2022 15:57:53 +0100 Subject: [PATCH 4/4] Update changelog for 11.1.1.2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index d80941e91..cf565ba2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yunohost (11.1.1.2) testing; urgency=low + + - group mailalias: the ldap class is in fact mailGroup, not mailAccount -_- (1cb5e43e) + + -- Alexandre Aubin Sat, 03 Dec 2022 15:57:22 +0100 + yunohost (11.1.1.1) testing; urgency=low - Fix again the legacy patch for yunohost user create @_@ (46d6fab0)