summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2018-09-29 22:39:20 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-10-01 11:40:37 +0000
commit6c806f2dd9dd4d081439d125a6bfb669bbb585e4 (patch)
treea0e4f880d3ad6caf2d1a7e9de03b8c1fc8eb9393
parent14cd84fa68b96c02e6ae1bac51511e1d7fd1a99b (diff)
downloadflatpak-6c806f2dd9dd4d081439d125a6bfb669bbb585e4.tar.gz
repo: Don't use remote ostree-metadata
The code was looking for a ref with the name ostree-metadata, but using an api that falls back to remote refs with the same name, which is not desirable here. Use a different ostree api instead that only resolves local refs. Closes: #1805 Closes: #2157 Approved by: alexlarsson
-rw-r--r--app/flatpak-builtins-repo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/flatpak-builtins-repo.c b/app/flatpak-builtins-repo.c
index d116530a..31dc4097 100644
--- a/app/flatpak-builtins-repo.c
+++ b/app/flatpak-builtins-repo.c
@@ -206,8 +206,8 @@ flatpak_builtin_repo (int argc, char **argv,
/* Try loading the metadata from the ostree-metadata branch first. If that
* fails, fall back to the summary file. */
ostree_metadata_ref = OSTREE_REPO_METADATA_REF;
- if (!ostree_repo_resolve_rev (repo, ostree_metadata_ref,
- TRUE, &ostree_metadata_checksum, error))
+ if (!ostree_repo_resolve_rev_ext (repo, ostree_metadata_ref,
+ TRUE, 0, &ostree_metadata_checksum, error))
return FALSE;
if (ostree_metadata_checksum != NULL)