diff options
| author | Alexander Larsson <alexl@redhat.com> | 2020-03-18 11:06:50 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2020-03-23 17:58:04 +0100 |
| commit | 124b0be92e0b033c35e04c5dcbea5a9da6915723 (patch) | |
| tree | 89f2c290ffe010940e529c0e1351b5afb782b90a /common/flatpak-related-ref.c | |
| parent | 336a127f5515f69c7d5c6aa7943076035c59bf84 (diff) | |
| download | flatpak-124b0be92e0b033c35e04c5dcbea5a9da6915723.tar.gz | |
Drop more collection_id use
Most code that looks for a regular collection id set on the remote is
removed, as these should never happen in flatpak repo setups now.
Some is replaces with looking at xa.sideload-collection-id:
* The libflatpak FlatpakRef::collection-id property now comes comes from the sideload id
* Various CLI commands showing or changing the collection-id for a remote now uses the sideload id
* Collection id deploy in update now sets the sideload-collection-id instead
* Setting the collection id for a remote in libflatpak now sets the sideload id
Additionally we now delete the code that allows unsigned summaries
when there is a collection id (because there is none).
create-usb now uses the sideload id as as collection id source when exporting.
The direct repo operations (export, bundle, commit-from) still support
collection ids, because on the server we do want to set it so that we
can sideload.
Diffstat (limited to 'common/flatpak-related-ref.c')
| -rw-r--r-- | common/flatpak-related-ref.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/common/flatpak-related-ref.c b/common/flatpak-related-ref.c index 27f52f3f..bdf2106d 100644 --- a/common/flatpak-related-ref.c +++ b/common/flatpak-related-ref.c @@ -256,7 +256,6 @@ flatpak_related_ref_get_subpaths (FlatpakRelatedRef *self) /** * flatpak_related_ref_new: - * @collection_id: (nullable): the collection ID * @full_ref: a full ref to refer to * @commit: (nullable): a commit ID to refer to * @subpaths: (nullable): a nul-terminated array of subpaths @@ -268,8 +267,7 @@ flatpak_related_ref_get_subpaths (FlatpakRelatedRef *self) * Returns: a new ref */ FlatpakRelatedRef * -flatpak_related_ref_new (const char *collection_id, - const char *full_ref, +flatpak_related_ref_new (const char *full_ref, const char *commit, char **subpaths, gboolean download, @@ -297,7 +295,6 @@ flatpak_related_ref_new (const char *collection_id, "subpaths", subpaths, "should-download", download, "should-delete", delete, - "collection-id", collection_id, NULL); return ref; |