mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-19 06:11:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bundle sources: the path is always sources

Browse Source
This commit is contained in:
Simon Schampijer
2017-04-05 07:04:10 +02:00
parent e473ca3b46
commit 16ca129253
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builder/builder-main.c
View File

@@ -676,7 +676,7 @@ main (int argc,
if (!do_export (build_context, &error, TRUE,
"--metadata=metadata.sources",
builder_context_get_build_runtime (build_context) ? "--files=usr/sources" : "--files=sources",
"--files=sources",
opt_repo, app_dir_path, builder_manifest_get_branch (manifest, opt_default_branch), NULL))
{
g_printerr ("Export failed: %s\n", error->message);

3
builder/builder-manifest.c
View File

@@ -2193,14 +2193,13 @@ builder_manifest_finish (BuilderManifest *self,
{
debuginfo_dir = g_file_resolve_relative_path (app_dir, "usr/lib/debug");
locale_parent_dir = g_file_resolve_relative_path (app_dir, "usr/" LOCALES_SEPARATE_DIR);
sources_dir = g_file_resolve_relative_path (app_dir, "usr/sources");
}
else
{
debuginfo_dir = g_file_resolve_relative_path (app_dir, "files/lib/debug");
locale_parent_dir = g_file_resolve_relative_path (app_dir, "files/" LOCALES_SEPARATE_DIR);
sources_dir = g_file_resolve_relative_path (app_dir, "sources");
}
sources_dir = g_file_resolve_relative_path (app_dir, "sources");
if (self->separate_locales && g_file_query_exists (locale_parent_dir, NULL))
{