diff options
| author | Ondrej Holy <oholy@redhat.com> | 2017-04-13 10:03:06 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2017-04-21 09:54:53 +0200 |
| commit | be643b7284a61f1f7c1b696383f5abc3133ec106 (patch) | |
| tree | 69c8948efa9eb8fff194a5b3df0972858349617e | |
| parent | 5d018cd76fb7cfac699602101bc06800569376c9 (diff) | |
| download | gvfs-be643b7284a61f1f7c1b696383f5abc3133ec106.tar.gz | |
google: Do not ignore errors when rebuilding cache
If file cache is not loaded properly (e.g. because of cancellation),
it may lead to various problems (e.g. incomplete enumeration). Let's
return error in such case and rebuild the cache next time...
https://bugzilla.gnome.org/show_bug.cgi?id=781252
| -rw-r--r-- | daemon/gvfsbackendgoogle.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/daemon/gvfsbackendgoogle.c b/daemon/gvfsbackendgoogle.c index 376c2309..7bed6084 100644 --- a/daemon/gvfsbackendgoogle.c +++ b/daemon/gvfsbackendgoogle.c @@ -557,18 +557,11 @@ rebuild_entries (GVfsBackendGoogle *self, feed = gdata_documents_service_query_documents (self->service, query, cancellable, NULL, NULL, &local_error); if (local_error != NULL) { - if (succeeded_once) - { - g_warning ("Unable to query: %s", local_error->message); - g_error_free (local_error); - } - else - { - sanitize_error (&local_error); - g_propagate_error (error, local_error); - } + sanitize_error (&local_error); + g_propagate_error (error, local_error); + self->entries_stale = TRUE; - break; + goto out; } if (!succeeded_once) @@ -598,6 +591,7 @@ rebuild_entries (GVfsBackendGoogle *self, self->entries_stale = FALSE; + out: g_clear_object (&feed); g_clear_object (&query); } |