diff options
author | Alexander Larsson <alexl@redhat.com> | 2018-04-13 11:48:30 +0200 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-04-16 15:44:06 +0000 |
commit | d791625d7793f5d9868db62538917118564d833d (patch) | |
tree | dffb5fde0ec45624209ae32743747e8df24c190a /common | |
parent | 37cdfa1d1dd2c2162602c83bc6ed069d7864bf05 (diff) | |
download | flatpak-d791625d7793f5d9868db62538917118564d833d.tar.gz |
transaction: Use FlatpakRemoteState to look up metadata
Closes: #1575
Approved by: alexlarsson
Diffstat (limited to 'common')
-rw-r--r-- | common/flatpak-dir.c | 60 | ||||
-rw-r--r-- | common/flatpak-dir.h | 8 |
2 files changed, 0 insertions, 68 deletions
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index eb2e2c59..c21fdeba 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -10714,66 +10714,6 @@ flatpak_dir_fetch_remote_commit (FlatpakDir *self, return g_steal_pointer (&commit_variant); } - -gboolean -flatpak_dir_fetch_ref_cache (FlatpakDir *self, - const char *remote_name, - const char *ref, - guint64 *download_size, - guint64 *installed_size, - char **metadata, - GCancellable *cancellable, - GError **error) -{ - g_autoptr(GVariant) cache_v = NULL; - g_autoptr(GVariant) cache = NULL; - g_autoptr(GVariant) res = NULL; - g_autoptr(GVariant) refdata = NULL; - int pos; - g_autoptr(GError) local_error = NULL; - - if (!flatpak_dir_lookup_repo_metadata (self, remote_name, cancellable, &local_error, - "xa.cache", "@*", &cache_v)) - { - if (local_error == NULL) - g_set_error_literal (&local_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, - _("No flatpak cache in remote summary")); - g_propagate_error (error, g_steal_pointer (&local_error)); - return FALSE; - } - - cache = g_variant_get_child_value (cache_v, 0); - - if (!flatpak_variant_bsearch_str (cache, ref, &pos)) - { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, - _("No entry for %s in remote summary flatpak cache "), ref); - return FALSE; - } - - refdata = g_variant_get_child_value (cache, pos); - res = g_variant_get_child_value (refdata, 1); - - if (installed_size) - { - guint64 v; - g_variant_get_child (res, 0, "t", &v); - *installed_size = GUINT64_FROM_BE (v); - } - - if (download_size) - { - guint64 v; - g_variant_get_child (res, 1, "t", &v); - *download_size = GUINT64_FROM_BE (v); - } - - if (metadata) - g_variant_get_child (res, 2, "s", metadata); - - return TRUE; -} - void flatpak_related_free (FlatpakRelated *self) { diff --git a/common/flatpak-dir.h b/common/flatpak-dir.h index 6b89de2b..ae8f765c 100644 --- a/common/flatpak-dir.h +++ b/common/flatpak-dir.h @@ -690,14 +690,6 @@ FlatpakRemoteState * flatpak_dir_get_remote_state_optional (FlatpakDir *self, const char *remote, GCancellable *cancellable, GError **error); -gboolean flatpak_dir_fetch_ref_cache (FlatpakDir *self, - const char *remote_name, - const char *ref, - guint64 *download_size, - guint64 *installed_size, - char **metadata, - GCancellable *cancellable, - GError **error); GPtrArray * flatpak_dir_find_remote_related (FlatpakDir *dir, const char *remote_name, const char *ref, |