Add --no-update-summary to export, commit-from and import-bundle

We want this for e.g. the build system where we will do multiple
repo operations and then atomically regenerate the summary once.

app/flatpak-builtins-build-commit-from.c

@@ -37,6 +37,7 @@ static char *opt_src_ref;
 static char *opt_subject;
 static char *opt_body;
 static gboolean opt_update_appstream;
+static gboolean opt_no_update_summary;
 static gboolean opt_untrusted;
 static char **opt_gpg_key_ids;
 static char *opt_gpg_homedir;
@@ -48,6 +49,7 @@ static GOptionEntry options[] = {
   { "subject", 's', 0, G_OPTION_ARG_STRING, &opt_subject, N_("One line subject"), N_("SUBJECT") },
   { "body", 'b', 0, G_OPTION_ARG_STRING, &opt_body, N_("Full description"), N_("BODY") },
   { "update-appstream", 0, 0, G_OPTION_ARG_NONE, &opt_update_appstream, N_("Update the appstream branch"), NULL },
+  { "no-update-summary", 0, 0, G_OPTION_ARG_NONE, &opt_no_update_summary, N_("Don't update the summary"), NULL },
   { "gpg-sign", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_gpg_key_ids, N_("GPG Key ID to sign the commit with"), N_("KEY-ID") },
   { "gpg-homedir", 0, 0, G_OPTION_ARG_STRING, &opt_gpg_homedir, N_("GPG Homedir to use when looking for keyrings"), N_("HOMEDIR") },
   { NULL }
@@ -256,7 +258,8 @@ flatpak_builtin_build_commit_from (int argc, char **argv, GCancellable *cancella
       !flatpak_repo_generate_appstream (dst_repo, (const char **) opt_gpg_key_ids, opt_gpg_homedir, cancellable, error))
     return FALSE;
 
-  if (!flatpak_repo_update (dst_repo,
+  if (!opt_no_update_summary &&
+      !flatpak_repo_update (dst_repo,
                             (const char **) opt_gpg_key_ids,
                             opt_gpg_homedir,
                             cancellable,

app/flatpak-builtins-build-export.c

@@ -37,6 +37,7 @@ static char *opt_body;
 static char *opt_arch;
 static gboolean opt_runtime;
 static gboolean opt_update_appstream;
+static gboolean opt_no_update_summary;
 static char **opt_gpg_key_ids;
 static char **opt_exclude;
 static char **opt_include;
@@ -50,6 +51,7 @@ static GOptionEntry options[] = {
   { "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, N_("Architecture to export for (must be host compatible)"), N_("ARCH") },
   { "runtime", 'r', 0, G_OPTION_ARG_NONE, &opt_runtime, N_("Commit runtime (/usr), not /app"), NULL },
   { "update-appstream", 0, 0, G_OPTION_ARG_NONE, &opt_update_appstream, N_("Update the appstream branch"), NULL },
+  { "no-update-summary", 0, 0, G_OPTION_ARG_NONE, &opt_no_update_summary, N_("Don't update the summary"), NULL },
   { "files", 0, 0, G_OPTION_ARG_STRING, &opt_files, N_("Use alternative directory for the files"), N_("SUBDIR") },
   { "metadata", 0, 0, G_OPTION_ARG_STRING, &opt_metadata, N_("Use alternative file for the metadata"), N_("FILE") },
   { "gpg-sign", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_gpg_key_ids, N_("GPG Key ID to sign the commit with"), N_("KEY-ID") },
@@ -698,7 +700,8 @@ flatpak_builtin_build_export (int argc, char **argv, GCancellable *cancellable,
       !flatpak_repo_generate_appstream (repo, (const char **) opt_gpg_key_ids, opt_gpg_homedir, cancellable, error))
     return FALSE;
 
-  if (!flatpak_repo_update (repo,
+  if (!opt_no_update_summary &&
+      !flatpak_repo_update (repo,
                             (const char **) opt_gpg_key_ids,
                             opt_gpg_homedir,
                             cancellable,

app/flatpak-builtins-build-import-bundle.c

@@ -37,6 +37,7 @@ static gboolean opt_oci = FALSE;
 static char **opt_gpg_key_ids;
 static char *opt_gpg_homedir;
 static gboolean opt_update_appstream;
+static gboolean opt_no_update_summary;
 
 static GOptionEntry options[] = {
   { "ref", 0, 0, G_OPTION_ARG_STRING, &opt_ref, N_("Override the ref used for the imported bundle"), N_("REF") },
@@ -44,6 +45,7 @@ static GOptionEntry options[] = {
   { "gpg-sign", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_gpg_key_ids, N_("GPG Key ID to sign the commit with"), N_("KEY-ID") },
   { "gpg-homedir", 0, 0, G_OPTION_ARG_STRING, &opt_gpg_homedir, N_("GPG Homedir to use when looking for keyrings"), N_("HOMEDIR") },
   { "update-appstream", 0, 0, G_OPTION_ARG_NONE, &opt_update_appstream, N_("Update the appstream branch"), NULL },
+  { "no-update-summary", 0, 0, G_OPTION_ARG_NONE, &opt_no_update_summary, N_("Don't update the summary"), NULL },
   { NULL }
 };
 
@@ -324,7 +326,8 @@ flatpak_builtin_build_import (int argc, char **argv, GCancellable *cancellable,
       !flatpak_repo_generate_appstream (repo, (const char **) opt_gpg_key_ids, opt_gpg_homedir, cancellable, error))
     return FALSE;
 
-  if (!flatpak_repo_update (repo,
+  if (!opt_no_update_summary &&
+      !flatpak_repo_update (repo,
                             (const char **) opt_gpg_key_ids,
                             opt_gpg_homedir,
                             cancellable,

doc/flatpak-build-commit-from.xml

@@ -128,6 +128,17 @@
                 </para></listitem>
             </varlistentry>
 
+            <varlistentry>
+                <term><option>--no-update-summary</option></term>
+
+                <listitem><para>
+                    Don't update the summary file after the new commit is added. This means
+                    the repository will not be useful for serving over http until build-repo-update
+                    has been run. This is useful is you want to do multiple repo operations before
+                    finally updating the summary.
+                </para></listitem>
+            </varlistentry>
+
             <varlistentry>
                 <term><option>--gpg-sign=KEYID</option></term>
 

doc/flatpak-build-export.xml

@@ -156,6 +156,17 @@
                 </para></listitem>
             </varlistentry>
 
+            <varlistentry>
+                <term><option>--no-update-summary</option></term>
+
+                <listitem><para>
+                    Don't update the summary file after the new commit is added. This means
+                    the repository will not be useful for serving over http until build-repo-update
+                    has been run. This is useful is you want to do multiple repo operations before
+                    finally updating the summary.
+                </para></listitem>
+            </varlistentry>
+
             <varlistentry>
                 <term><option>--gpg-sign=KEYID</option></term>
 

doc/flatpak-build-import-bundle.xml

@@ -97,6 +97,17 @@
                 </para></listitem>
             </varlistentry>
 
+            <varlistentry>
+                <term><option>--no-update-summary</option></term>
+
+                <listitem><para>
+                    Don't update the summary file after the new commit is added. This means
+                    the repository will not be useful for serving over http until build-repo-update
+                    has been run. This is useful is you want to do multiple repo operations before
+                    finally updating the summary.
+                </para></listitem>
+            </varlistentry>
+
             <varlistentry>
                 <term><option>--gpg-sign=KEYID</option></term>