Skip to content

Move locale migration after cleanup #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Move locale migration after cleanup #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/builder-manifest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2761,6 +2761,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);
Expand Down
16 changes: 0 additions & 16 deletions src/builder-module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1916,22 +1916,6 @@ builder_module_build_helper (BuilderModule *self,

builder_set_term_title (_("Post-Install %s"), self->name);

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 (self->post_install)
{
for (i = 0; self->post_install[i] != NULL; i++)
Expand Down