Blame evolution-data-server-3.6.4-signature-migration.patch
|
Milan Crha |
cbd31e |
diff --git a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
|
|
Milan Crha |
cbd31e |
index 2d695f6..6729af3 100644
|
|
Milan Crha |
cbd31e |
--- a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
|
|
Milan Crha |
cbd31e |
+++ b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
|
|
Milan Crha |
cbd31e |
@@ -2161,17 +2161,19 @@ migrate_parse_signature_xml_text (GMarkupParseContext *context,
|
|
Milan Crha |
cbd31e |
parse_data->signature_file = NULL;
|
|
Milan Crha |
cbd31e |
|
|
Milan Crha |
cbd31e |
/* If the signature is a script, we symlink to it.
|
|
Milan Crha |
cbd31e |
- * Otherwise we move and rename the regular file. */
|
|
Milan Crha |
cbd31e |
+ * Otherwise we move and rename the regular file.
|
|
Milan Crha |
cbd31e |
+ * Also ignore errors here, otherwise it stops whole migration.
|
|
Milan Crha |
cbd31e |
+ */
|
|
Milan Crha |
cbd31e |
if (parse_data->is_script)
|
|
Milan Crha |
cbd31e |
g_file_make_symbolic_link (
|
|
Milan Crha |
cbd31e |
new_signature_file,
|
|
Milan Crha |
cbd31e |
- absolute_path, NULL, error);
|
|
Milan Crha |
cbd31e |
+ absolute_path, NULL, NULL);
|
|
Milan Crha |
cbd31e |
else
|
|
Milan Crha |
cbd31e |
g_file_move (
|
|
Milan Crha |
cbd31e |
old_signature_file,
|
|
Milan Crha |
cbd31e |
new_signature_file,
|
|
Milan Crha |
cbd31e |
G_FILE_COPY_NONE,
|
|
Milan Crha |
cbd31e |
- NULL, NULL, NULL, error);
|
|
Milan Crha |
cbd31e |
+ NULL, NULL, NULL, NULL);
|
|
Milan Crha |
cbd31e |
|
|
Milan Crha |
cbd31e |
g_object_unref (old_signature_file);
|
|
Milan Crha |
cbd31e |
g_object_unref (new_signature_file);
|