diff --git a/common/flatpak-dir-private.h b/common/flatpak-dir-private.h index 7a6d7080..e8146c9d 100644 --- a/common/flatpak-dir-private.h +++ b/common/flatpak-dir-private.h @@ -956,7 +956,6 @@ GPtrArray * flatpak_dir_find_remote_related (FlatpakDir *dir, GError **error); GPtrArray * flatpak_dir_find_local_related_for_metadata (FlatpakDir *self, const char *ref, - const char *commit, const char *remote_name, GKeyFile *metakey, GCancellable *cancellable, diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 7dbdc12a..a52a88a6 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -13964,7 +13964,6 @@ local_match_prefix (FlatpakDir *self, GPtrArray * flatpak_dir_find_local_related_for_metadata (FlatpakDir *self, const char *ref, - const char *commit, const char *remote_name, GKeyFile *metakey, GCancellable *cancellable, @@ -14115,7 +14114,6 @@ flatpak_dir_find_local_related (FlatpakDir *self, g_autofree char *metadata_contents = NULL; g_autoptr(GKeyFile) metakey = g_key_file_new (); g_autoptr(GPtrArray) related = NULL; - g_autofree char *checksum = NULL; if (!flatpak_dir_ensure_repo (self, cancellable, error)) return NULL; @@ -14134,8 +14132,6 @@ flatpak_dir_find_local_related (FlatpakDir *self, if (deploy_data == NULL) return NULL; - checksum = g_strdup (flatpak_deploy_data_get_commit (deploy_data)); - metadata = g_file_get_child (deploy_dir, "metadata"); if (!g_file_load_contents (metadata, cancellable, &metadata_contents, NULL, NULL, NULL)) { @@ -14145,6 +14141,7 @@ flatpak_dir_find_local_related (FlatpakDir *self, } else { + g_autofree char *checksum = NULL; g_autoptr(GVariant) commit_data = flatpak_dir_read_latest_commit (self, remote_name, ref, &checksum, NULL, NULL); if (commit_data) { @@ -14157,7 +14154,7 @@ flatpak_dir_find_local_related (FlatpakDir *self, if (metadata_contents && g_key_file_load_from_data (metakey, metadata_contents, -1, 0, NULL)) - related = flatpak_dir_find_local_related_for_metadata (self, ref, checksum, remote_name, metakey, cancellable, error); + related = flatpak_dir_find_local_related_for_metadata (self, ref, remote_name, metakey, cancellable, error); else related = g_ptr_array_new_with_free_func ((GDestroyNotify) flatpak_related_free); diff --git a/common/flatpak-transaction.c b/common/flatpak-transaction.c index b2a18c8e..141f8505 100644 --- a/common/flatpak-transaction.c +++ b/common/flatpak-transaction.c @@ -1884,7 +1884,7 @@ add_related (FlatpakTransaction *self, } if (transaction_is_local_only (self, op->kind)) - related = flatpak_dir_find_local_related_for_metadata (priv->dir, op->ref, op->resolved_commit, op->remote, op->resolved_metakey, + related = flatpak_dir_find_local_related_for_metadata (priv->dir, op->ref, op->remote, op->resolved_metakey, NULL, &local_error); else related = flatpak_dir_find_remote_related_for_metadata (priv->dir, state, op->ref, op->resolved_metakey,