mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-23 09:24:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

dir: Remove unused variable

Browse Source 
This is no longer needed since commit 124b0be92
This commit is contained in:
Phaedrus Leeds
2020-09-17 19:20:38 -07:00
committed by Alexander Larsson
parent 6985bf27ac
commit ce2e36d8ea
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/flatpak-dir-private.h
View File

@@ -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,

7
common/flatpak-dir.c
View File

@@ -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);

2
common/flatpak-transaction.c
View File

@@ -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,