builder-manifest: Run locale migration after cleanup

Otherwise, module-level cleanup can remove locale symlinks that point to
locale data installed by other modules.

Closes #154

Author: chrisawi

src/builder-manifest.c

@@ -2783,6 +2783,22 @@ builder_manifest_cleanup (BuilderManifest *self,
             }
         }
 
+      if (builder_context_get_separate_locales (context))
+        {
+          g_autoptr(GFile) root_dir = NULL;
+
+          if (builder_context_get_build_runtime (context))
+            root_dir = g_file_get_child (app_dir, "usr");
+          else
+            root_dir = g_file_get_child (app_dir, "files");
+
+          if (!builder_migrate_locale_dirs (root_dir, error))
+            {
+              g_prefix_error (error, "Can't migrate locale dirs: ");
+              return FALSE;
+            }
+        }
+
       app_root = g_file_get_child (app_dir, "files");
 
       appdata_source = builder_manifest_find_appdata_file (self, app_root);

src/builder-module.c

@@ -2178,22 +2178,6 @@ builder_module_build_helper (BuilderModule   *self,
         return FALSE;
     }
 
-  if (builder_context_get_separate_locales (context))
-    {
-      g_autoptr(GFile) root_dir = NULL;
-
-      if (builder_context_get_build_runtime (context))
-        root_dir = g_file_get_child (app_dir, "usr");
-      else
-        root_dir = g_file_get_child (app_dir, "files");
-
-      if (!builder_migrate_locale_dirs (root_dir, error))
-        {
-          g_prefix_error (error, "module %s: ", self->name);
-          return FALSE;
-        }
-    }
-
   if (!builder_module_install_licenses (self, id, source_dir, app_dir, error))
     return FALSE;