import CS gnome-online-accounts-3.40.0-8.el9

This commit is contained in:
eabdullin 2025-03-11 07:18:12 +00:00
parent e22f2c9202
commit 2c47f56ec7
2 changed files with 45 additions and 1 deletions

View File

@ -0,0 +1,40 @@
diff --git a/src/daemon/goadaemon.c b/src/daemon/goadaemon.c
index 0eb372e..db770b4 100644
--- a/src/daemon/goadaemon.c
+++ b/src/daemon/goadaemon.c
@@ -535,14 +535,14 @@ add_config_file (GoaDaemon *self,
if (provider_type != NULL)
provider = goa_provider_get_for_provider_type (provider_type);
+ needs_update = g_key_file_remove_group (key_file, groups[n], NULL) || needs_update;
+
if (provider == NULL)
{
- g_warning ("Unsupported account type %s for ID %s (no provider)", provider_type, id);
+ g_debug ("Unsupported account type %s for ID %s (no provider)", provider_type, id);
goto cleanup_and_continue;
}
- needs_update = g_key_file_remove_group (key_file, groups[n], NULL);
-
error = NULL;
if (!goa_utils_delete_credentials_for_id_sync (provider, id, NULL, &error))
{
@@ -562,7 +562,7 @@ add_config_file (GoaDaemon *self,
}
else
{
- needs_update = g_key_file_remove_key (key_file, groups[n], "SessionId", NULL);
+ needs_update = g_key_file_remove_key (key_file, groups[n], "SessionId", NULL) || needs_update;
}
g_hash_table_insert (group_name_to_key_file_data,
@@ -647,7 +647,7 @@ update_account_object (GoaDaemon *self,
provider = goa_provider_get_for_provider_type (type);
if (provider == NULL)
{
- g_warning ("Unsupported account type %s for identity %s (no provider)", type, identity);
+ g_debug ("Unsupported account type %s for identity %s (no provider)", type, identity);
goto out;
}

View File

@ -5,7 +5,7 @@
Name: gnome-online-accounts
Version: 3.40.0
Release: 7%{?dist}
Release: 8%{?dist}
Summary: Single sign-on framework for GNOME
License: LGPLv2+
@ -22,6 +22,7 @@ Patch: 0001-google-Remove-Photos-support.patch
Patch: kerberos-fixes.patch
Patch: 0003-Drop-dependency-on-WebKitGTK-139.patch
Patch: 0004-Restrict-Services.patch
Patch: 0005-Mute-no-provider-warning.patch
Obsoletes: gnome-online-accounts-oauth2 < 3.40.0-5
@ -136,6 +137,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%{_datadir}/vala/
%changelog
* Wed Jan 08 2025 Milan Crha <mcrha@redhat.com> - 3.40.0-8
- Resolves: RHEL-34647 (goa-daemon: Mute "Unsupported account type ... (no provider)" error)
* Wed Jun 12 2024 Milan Crha <mcrha@redhat.com> - 3.40.0-7
- Resolves: RHEL-40831 (Use /etc/goa.conf to disable features for providers and whole providers)