From 81add41fddb40a126d4cf439486eae175c73d5a6 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 5 Mar 2019 01:33:50 +0100 Subject: [PATCH] Misc wording / formatting --- locales/en.json | 2 +- src/yunohost/permission.py | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/locales/en.json b/locales/en.json index d643f07fa..6f9d28a40 100644 --- a/locales/en.json +++ b/locales/en.json @@ -416,7 +416,7 @@ "permission_not_found": "Permission '{permission:s}' not found for application {app:s}", "permission_name_not_valid": "Permission name '{permission:s}' not valid", "permission_update_failed": "Permission update failed", - "permission_generated": "Permission updated", + "permission_generated": "The permission database has been updated.", "permission_updated": "Permission '{permission:s}' for app {app:s} updated", "permission_update_nothing_to_do": "No permissions to update", "port_already_closed": "Port {port:d} is already closed for {ip_version:s} connections", diff --git a/src/yunohost/permission.py b/src/yunohost/permission.py index 61615cbb5..aabf7f7a0 100644 --- a/src/yunohost/permission.py +++ b/src/yunohost/permission.py @@ -445,11 +445,14 @@ def permission_remove(operation_logger, auth, app, permission, force=False, sync def permission_sync_to_user(auth, force=False): """ - Sychronise the inheritPermission attribut in the permission object from the user<->group link and the group<->permission link + Sychronise the inheritPermission attribut in the permission object from the + user<->group link and the group<->permission link Keyword argument: - force -- Force to recreate all attributes. Used generally with the backup which wich use "slapadd" which don't use the memberOf overlay. - Note that by removing all value and adding a new time, we force the overlay to update all attributes + force -- Force to recreate all attributes. Used generally with the + backup which uses "slapadd" which doesnt' use the memberOf overlay. + Note that by removing all value and adding a new time, we force the + overlay to update all attributes """ # Note that a LDAP operation with the same value that is in LDAP crash SLAP. # So we need to check before each ldap operation that we really change something in LDAP @@ -505,6 +508,6 @@ def permission_sync_to_user(auth, force=False): app_ssowatconf(auth) - # Reload unscd because if not the group is not updated in the system from LDAP + # Reload unscd, otherwise the group ain't propagated to the LDAP database os.system('nscd --invalidate=passwd') os.system('nscd --invalidate=group')