diff options
| author | Alexander Larsson <alexl@redhat.com> | 2016-03-23 16:42:40 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2016-03-23 16:42:40 +0100 |
| commit | 7e6b18eddcc0a8a80a20b97d1ad89b803fc7b08f (patch) | |
| tree | da38afc8c4da3c6b6fe6cb2699de36e60be99f1f /builder | |
| parent | d32b13a695184e863f9334f5f0832217e86101a3 (diff) | |
| download | xdg-app-7e6b18eddcc0a8a80a20b97d1ad89b803fc7b08f.tar.gz | |
builder: Actually respect the defined branch
Diffstat (limited to 'builder')
| -rw-r--r-- | builder/builder-manifest.c | 5 | ||||
| -rw-r--r-- | builder/builder-manifest.h | 1 | ||||
| -rw-r--r-- | builder/xdg-app-builder-main.c | 10 |
3 files changed, 11 insertions, 5 deletions
diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c index bb39f0d..5882b20 100644 --- a/builder/builder-manifest.c +++ b/builder/builder-manifest.c @@ -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, diff --git a/builder/builder-manifest.h b/builder/builder-manifest.h index 4778705..32d966a 100644 --- a/builder/builder-manifest.h +++ b/builder/builder-manifest.h @@ -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, diff --git a/builder/xdg-app-builder-main.c b/builder/xdg-app-builder-main.c index 7d00b53..d284370 100644 --- a/builder/xdg-app-builder-main.c +++ b/builder/xdg-app-builder-main.c @@ -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; |