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 /system-helper | |
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 'system-helper')
-rw-r--r-- | system-helper/flatpak-system-helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c index 37ba8c76..1f69a059 100644 --- a/system-helper/flatpak-system-helper.c +++ b/system-helper/flatpak-system-helper.c @@ -1231,7 +1231,7 @@ handle_update_remote (FlatpakSystemHelper *object, return TRUE; } - if (summary_sig_bytes == NULL && state->collection_id == NULL) + if (summary_sig_bytes == NULL) { g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "UpdateRemote requires a summary signature"); |