From e1ad3a7a3c2b408e9159a0a84fda69cd57abe212 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Wed, 7 Sep 2016 12:31:56 +0200
Subject: [PATCH] flatpak-info: Add application branch info

Note: This is only available in flatpak run, not flatpak build, where
this info is not available.
---
 app/flatpak-builtins-build.c | 2 +-
 common/flatpak-run.c         | 5 ++++-
 common/flatpak-run.h         | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/flatpak-builtins-build.c b/app/flatpak-builtins-build.c
index 6bb11e5b..6fa99e07 100644
--- a/app/flatpak-builtins-build.c
+++ b/app/flatpak-builtins-build.c
@@ -193,7 +193,7 @@ flatpak_builtin_build (int argc, char **argv, GCancellable *cancellable, GError
                                       NULL,
                                       app_files,
                                       runtime_files,
-                                      app_id,
+                                      app_id, NULL,
                                       runtime_ref,
                                       app_context,
                                       error))
diff --git a/common/flatpak-run.c b/common/flatpak-run.c
index 66597154..4524f921 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -2546,6 +2546,7 @@ flatpak_run_add_app_info_args (GPtrArray      *argv_array,
                                GFile          *app_files,
                                GFile          *runtime_files,
                                const char     *app_id,
+                               const char     *app_branch,
                                const char     *runtime_ref,
                                FlatpakContext *final_app_context,
                                GError        **error)
@@ -2568,6 +2569,8 @@ flatpak_run_add_app_info_args (GPtrArray      *argv_array,
       keyfile = g_key_file_new ();
 
       g_key_file_set_string (keyfile, "Application", "name", app_id);
+      if (app_branch != NULL)
+        g_key_file_set_string (keyfile, "Application", "branch", app_branch);
       g_key_file_set_string (keyfile, "Application", "runtime", runtime_ref);
 
       app_path = g_file_get_path (app_files);
@@ -3335,7 +3338,7 @@ flatpak_run_app (const char     *app_ref,
   if (!flatpak_run_setup_base_argv (argv_array, fd_array, runtime_files, app_id_dir, app_ref_parts[2], flags, error))
     return FALSE;
 
-  if (!flatpak_run_add_app_info_args (argv_array, fd_array, app_files, runtime_files, app_ref_parts[1], runtime_ref, app_context, error))
+  if (!flatpak_run_add_app_info_args (argv_array, fd_array, app_files, runtime_files, app_ref_parts[1], app_ref_parts[3], runtime_ref, app_context, error))
     return FALSE;
 
   if (!flatpak_run_add_extension_args (argv_array, metakey, app_ref, cancellable, error))
diff --git a/common/flatpak-run.h b/common/flatpak-run.h
index 09acdf41..0a954210 100644
--- a/common/flatpak-run.h
+++ b/common/flatpak-run.h
@@ -114,6 +114,7 @@ gboolean flatpak_run_add_app_info_args (GPtrArray      *argv_array,
                                         GFile          *app_files,
                                         GFile          *runtime_files,
                                         const char     *app_id,
+                                        const char     *app_branch,
                                         const char     *runtime_ref,
                                         FlatpakContext *final_app_context,
                                         GError        **error);