|
 |
237ab2 |
From 6aac44a17c6b5bcc258458d554963c51e019e489 Mon Sep 17 00:00:00 2001
|
|
|
237ab2 |
From: Benjamin Berg <bberg@redhat.com>
|
|
|
237ab2 |
Date: Mon, 8 Oct 2018 21:10:04 +0200
|
|
|
237ab2 |
Subject: [PATCH] housekeeping: Ignore permission issues during file deletion
|
|
|
237ab2 |
|
|
|
237ab2 |
The directories that are monitored by gsd-housekeeping are likely to
|
|
|
237ab2 |
contain files from other users that cannot be deleted. This will result
|
|
|
237ab2 |
in permission denied errors that can be safely ignored.
|
|
|
237ab2 |
|
|
|
237ab2 |
Fixes #26
|
|
|
237ab2 |
---
|
|
|
237ab2 |
plugins/housekeeping/gsd-disk-space.c | 3 ++-
|
|
|
237ab2 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
237ab2 |
|
|
|
237ab2 |
diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c
|
|
|
237ab2 |
index 40f0a8b7..bd3437e5 100644
|
|
|
237ab2 |
--- a/plugins/housekeeping/gsd-disk-space.c
|
|
|
237ab2 |
+++ b/plugins/housekeeping/gsd-disk-space.c
|
|
|
237ab2 |
@@ -366,7 +366,8 @@ delete_subdir (GObject *source,
|
|
|
237ab2 |
enumerator = g_file_enumerate_children_finish (file, res, &error);
|
|
|
237ab2 |
if (error) {
|
|
|
237ab2 |
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_DIRECTORY) &&
|
|
|
237ab2 |
- !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
|
|
|
237ab2 |
+ !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) &&
|
|
|
237ab2 |
+ !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED))
|
|
|
237ab2 |
g_warning ("Failed to enumerate children of %s: %s\n", data->name, error->message);
|
|
|
237ab2 |
}
|
|
|
237ab2 |
if (enumerator) {
|
|
|
237ab2 |
--
|
|
|
237ab2 |
2.31.1
|
|
|
237ab2 |
|