packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/repo: Define a metadata key, ostree.deploy-collection-id 

This commit defines a metadata key that tells clients to update their
remote config to add a collection ID. This functionality is currently
implemented in Flatpak for the key "xa.collection-id", but there are two
good reasons for moving the key to OSTree:

1) Servers such as Flathub shouldn't set xa.collection-id in their
metadata now or in the medium term future, because many users are still
using old versions of Flatpak and OSTree[1] which would hit various
bugs[2][3][4] on the P2P code paths that are enabled by collection IDs.
Defining a new key means that only clients running recent
(as-yet-unreleased) versions of Flatpak and OSTree will pay attention to
it and deploy the collection ID, leaving the users on old versions
unaffected.

2) OSTree is as "invested" in collection IDs as Flatpak, so there's no
reason the key should be defined in Flatpak rather than here. According
to Philip Withnall, the reason the key was put in Flatpak originally was
that at the time there was uncertainty about tying OSTree to collection
IDs.

[1] https://ahayzen.com/direct/flathub.html#downloadsbyflatpakstacked
[2] https://github.com/ostreedev/ostree/commit/e4e6d85ea
[3] https://github.com/flatpak/flatpak/commit/5813639f
[4] https://github.com/flatpak/flatpak/commit/5b21a5b7

Closes: #1726
Approved by: pwithnall
This commit is contained in:
Matthew Leeds 2018-09-19 14:59:47 -07:00 committed by Atomic Bot
parent b32c9e0df9
commit fc84fb402c
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apidoc/ostree-sections.txt
View File

@ -598,6 +598,7 @@ ostree_repo_pull_from_remotes_async
ostree_repo_pull_from_remotes_finish ostree_repo_pull_from_remotes_finish
ostree_repo_resolve_keyring_for_collection ostree_repo_resolve_keyring_for_collection
OSTREE_REPO_METADATA_REF OSTREE_REPO_METADATA_REF
OSTREE_META_KEY_DEPLOY_COLLECTION_ID
</SECTION> </SECTION>
<SECTION> <SECTION>

23
src/libostree/ostree-repo.h
View File

@ -1397,6 +1397,29 @@ gboolean ostree_repo_regenerate_summary (OstreeRepo *self,
*/ */
#define OSTREE_REPO_METADATA_REF "ostree-metadata" #define OSTREE_REPO_METADATA_REF "ostree-metadata"
/**
* OSTREE_META_KEY_DEPLOY_COLLECTION_ID:
*
* GVariant type `s`. This key can be used in the repo metadata which is stored
* in OSTREE_REPO_METADATA_REF as well as in the summary. The semantics of this
* are that the remote repository wants clients to update their remote config
* to add this collection ID (clients can't do P2P operations involving a
* remote without a collection ID configured on it, even if one is configured
* on the server side). Clients must never change or remove a collection ID
* already set in their remote config.
*
* Currently, OSTree does not implement changing a remote config based on this
* key, but it may do so in a later release, and until then clients such as
* Flatpak may implement it.
*
* This is a replacement for the similar metadata key implemented by flatpak,
* `xa.collection-id`, which is now deprecated as clients which supported it had
* bugs with their P2P implementations.
*
* Since: 2018.9
*/
#define OSTREE_META_KEY_DEPLOY_COLLECTION_ID "ostree.deploy-collection-id"
G_END_DECLS G_END_DECLS