diff options
| author | Milan Crha <mcrha@redhat.com> | 2013-03-07 12:57:19 +0100 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2013-03-07 12:57:19 +0100 |
| commit | 2501c04c7a84b86ab481b8ea6a6c37d7feb76db4 (patch) | |
| tree | eaa51f206257576264e9a3c16163129304940377 | |
| parent | f75ccaea9b856ea6629cc0ae40075dd68982280a (diff) | |
| download | evolution-data-server-2501c04c7a84b86ab481b8ea6a6c37d7feb76db4.tar.gz | |
Bug #695308 - Migration of broken signature breaks whole migration
| -rw-r--r-- | services/evolution-source-registry/evolution-source-registry-migrate-sources.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c index 2d695f6d2..6729af38f 100644 --- a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c +++ b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c @@ -2161,17 +2161,19 @@ migrate_parse_signature_xml_text (GMarkupParseContext *context, parse_data->signature_file = NULL; /* If the signature is a script, we symlink to it. - * Otherwise we move and rename the regular file. */ + * Otherwise we move and rename the regular file. + * Also ignore errors here, otherwise it stops whole migration. + */ if (parse_data->is_script) g_file_make_symbolic_link ( new_signature_file, - absolute_path, NULL, error); + absolute_path, NULL, NULL); else g_file_move ( old_signature_file, new_signature_file, G_FILE_COPY_NONE, - NULL, NULL, NULL, error); + NULL, NULL, NULL, NULL); g_object_unref (old_signature_file); g_object_unref (new_signature_file); |