Bug #695308 - Migration of broken signature breaks whole migration
authorMilan Crha <mcrha@redhat.com>
Thu, 7 Mar 2013 11:56:06 +0000 (12:56 +0100)
committerMilan Crha <mcrha@redhat.com>
Thu, 7 Mar 2013 11:56:57 +0000 (12:56 +0100)
services/evolution-source-registry/evolution-source-registry-migrate-sources.c

index deadcdf..9653ba8 100644 (file)
@@ -2189,17 +2189,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);