diff --git a/common/flatpak-dir-private.h b/common/flatpak-dir-private.h index 5a66bc31..1388a865 100644 --- a/common/flatpak-dir-private.h +++ b/common/flatpak-dir-private.h @@ -526,6 +526,7 @@ char *flatpak_dir_ensure_bundle_remote (FlatpakDir *self, GFile *file, GBytes *extra_gpg_data, char **out_ref, + char **out_commit, char **out_metadata, gboolean *out_created_remote, GCancellable *cancellable, diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 18a696d7..0dd512c5 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -6740,6 +6740,7 @@ flatpak_dir_ensure_bundle_remote (FlatpakDir *self, GFile *file, GBytes *extra_gpg_data, char **out_ref, + char **out_checksum, char **out_metadata, gboolean *out_created_remote, GCancellable *cancellable, @@ -6821,6 +6822,9 @@ flatpak_dir_ensure_bundle_remote (FlatpakDir *self, if (out_ref) *out_ref = g_steal_pointer (&ref); + if (out_checksum) + *out_checksum = g_steal_pointer (&to_checksum); + if (out_metadata) *out_metadata = g_steal_pointer (&fp_metadata); diff --git a/common/flatpak-installation.c b/common/flatpak-installation.c index 7f2d5a67..f536c757 100644 --- a/common/flatpak-installation.c +++ b/common/flatpak-installation.c @@ -1582,7 +1582,7 @@ flatpak_installation_install_bundle (FlatpakInstallation *self, if (dir == NULL) return NULL; - remote = flatpak_dir_ensure_bundle_remote (dir, file, NULL, &ref, NULL, NULL, cancellable, error); + remote = flatpak_dir_ensure_bundle_remote (dir, file, NULL, &ref, NULL, NULL, NULL, cancellable, error); if (remote == NULL) return NULL; diff --git a/common/flatpak-transaction.c b/common/flatpak-transaction.c index 8c249623..68bdaed9 100644 --- a/common/flatpak-transaction.c +++ b/common/flatpak-transaction.c @@ -1200,11 +1200,12 @@ flatpak_transaction_add_install_bundle (FlatpakTransaction *self, FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self); g_autofree char *remote = NULL; g_autofree char *ref = NULL; + g_autofree char *commit = NULL; g_autofree char *metadata = NULL; gboolean created_remote; remote = flatpak_dir_ensure_bundle_remote (priv->dir, file, gpg_data, - &ref, &metadata, &created_remote, + &ref, &commit, &metadata, &created_remote, NULL, error); if (remote == NULL) return FALSE; @@ -1212,7 +1213,7 @@ flatpak_transaction_add_install_bundle (FlatpakTransaction *self, if (!flatpak_dir_recreate_repo (priv->dir, NULL, error)) return FALSE; - return flatpak_transaction_add_ref (self, remote, ref, NULL, NULL, FLATPAK_TRANSACTION_OP_KIND_BUNDLE, file, metadata, error); + return flatpak_transaction_add_ref (self, remote, ref, NULL, commit, FLATPAK_TRANSACTION_OP_KIND_BUNDLE, file, metadata, error); } gboolean