mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-29 03:26:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

builder: Actually respect the defined branch

Browse Source
This commit is contained in:
Alexander Larsson
2016-03-23 16:42:40 +01:00
parent d32b13a695
commit 7e6b18eddc
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builder/builder-manifest.c
View File

@@ -803,6 +803,11 @@ builder_manifest_get_runtime_version (BuilderManifest *self)
return self->runtime_version ? self->runtime_version : "master";
}
const char *
builder_manifest_get_branch (BuilderManifest *self)
{
return self->branch ? self->branch : "master";
}
static char *
xdg_app (GError **error,

1
builder/builder-manifest.h
View File

@@ -47,6 +47,7 @@ const char * builder_manifest_get_id (BuilderManifest *self);
const char * builder_manifest_get_id_platform (BuilderManifest *self);
BuilderOptions *builder_manifest_get_build_options (BuilderManifest *self);
GList * builder_manifest_get_modules (BuilderManifest *self);
const char * builder_manifest_get_branch (BuilderManifest *self);
gboolean builder_manifest_start (BuilderManifest *self,
BuilderContext *context,

10
builder/xdg-app-builder-main.c
View File

@@ -354,7 +354,7 @@ main (int argc,
"--exclude=/lib/debug/*",
"--include=/lib/debug/app",
builder_context_get_separate_locales (build_context) ? "--exclude=/share/runtime/locale/*/*" : skip_arg,
opt_repo, app_dir_path, NULL))
opt_repo, app_dir_path, builder_manifest_get_branch (manifest), NULL))
{
g_print ("Export failed: %s\n", error->message);
return 1;
@@ -393,7 +393,7 @@ main (int argc,
if (!do_export (&error, TRUE,
metadata_arg,
files_arg,
opt_repo, app_dir_path, NULL))
opt_repo, app_dir_path, builder_manifest_get_branch (manifest), NULL))
{
g_print ("Export failed: %s\n", error->message);
return 1;
@@ -409,7 +409,7 @@ main (int argc,
if (!do_export (&error, TRUE,
"--metadata=metadata.debuginfo",
builder_context_get_build_runtime (build_context) ? "--files=usr/lib/debug" : "--files=files/lib/debug",
opt_repo, app_dir_path, NULL))
opt_repo, app_dir_path, builder_manifest_get_branch (manifest), NULL))
{
g_print ("Export failed: %s\n", error->message);
return 1;
@@ -427,7 +427,7 @@ main (int argc,
"--metadata=metadata.platform",
"--files=platform",
builder_context_get_separate_locales (build_context) ? "--exclude=/share/runtime/locale/*/*" : skip_arg,
opt_repo, app_dir_path, NULL))
opt_repo, app_dir_path, builder_manifest_get_branch (manifest), NULL))
{
g_print ("Export failed: %s\n", error->message);
return 1;
@@ -465,7 +465,7 @@ main (int argc,
if (!do_export (&error, TRUE,
metadata_arg,
files_arg,
opt_repo, app_dir_path, NULL))
opt_repo, app_dir_path, builder_manifest_get_branch (manifest), NULL))
{
g_print ("Export failed: %s\n", error->message);
return 1;