sysupdate: change "appstream" json prop back to "appStream"
Similar as the previous commit: the field was renamed by accident, and we should revert to the old name to not break compat needlessly, and because the old name actually made sense, given the underlying .transfer file knob is AppStream=
This commit is contained in:
@@ -144,9 +144,9 @@ CHANGES WITH 262 in spe:
|
||||
hierarchy that is not merged is now shown as "-" instead of "none".
|
||||
|
||||
* The JSON payload returned by systemd-sysupdated's DescribeFeature()
|
||||
method changed the "name" keys to "id". The "appStream" key is now
|
||||
"appstream", and the "documentation" key is now an array of strings.
|
||||
Consumers of this interface must update their JSON parsing
|
||||
method and by the "systemd-sysupdate features" command changed the
|
||||
"name" key to "id". The "documentation" key is now an array of
|
||||
strings. Consumers of this interface must update their JSON parsing
|
||||
accordingly.
|
||||
|
||||
* The PrivateUsersOwnership= setting in .nspawn files now defaults to
|
||||
|
||||
@@ -350,7 +350,7 @@ node /org/freedesktop/sysupdate1/target/host {
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><literal>appstream</literal></term>
|
||||
<term><literal>appStream</literal></term>
|
||||
<listitem><para>An optional string that contains an HTTP/HTTPS URL to an
|
||||
<ulink url="https://wwww.freedesktop.org/software/appstream/docs/chap-CatalogData.html">appstream
|
||||
catalog</ulink> XML file containing metadata about this feature.</para></listitem>
|
||||
|
||||
@@ -39,7 +39,7 @@ static SD_VARLINK_DEFINE_STRUCT_TYPE(
|
||||
SD_VARLINK_FIELD_COMMENT("URLs to documentation for the feature."),
|
||||
SD_VARLINK_DEFINE_FIELD(documentation, SD_VARLINK_STRING, SD_VARLINK_NULLABLE|SD_VARLINK_ARRAY),
|
||||
SD_VARLINK_FIELD_COMMENT("A URL to an AppStream catalog XML file describing the feature."),
|
||||
SD_VARLINK_DEFINE_FIELD(appstream, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
|
||||
SD_VARLINK_DEFINE_FIELD(appStream, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
|
||||
SD_VARLINK_FIELD_COMMENT("Whether the feature is enabled."),
|
||||
SD_VARLINK_DEFINE_FIELD(enabled, SD_VARLINK_BOOL, 0),
|
||||
SD_VARLINK_FIELD_COMMENT("Whether the feature is suggested for enablement."),
|
||||
|
||||
@@ -2442,7 +2442,7 @@ static int feature_to_json(Context *context, const Feature *f, sd_json_variant *
|
||||
SD_JSON_BUILD_PAIR_STRING("id", f->id),
|
||||
JSON_BUILD_PAIR_STRING_NON_EMPTY("description", f->description),
|
||||
JSON_BUILD_PAIR_STRV_NON_EMPTY("documentation", f->documentation),
|
||||
JSON_BUILD_PAIR_STRING_NON_EMPTY("appstream", f->appstream),
|
||||
JSON_BUILD_PAIR_STRING_NON_EMPTY("appStream", f->appstream),
|
||||
SD_JSON_BUILD_PAIR_BOOLEAN("enabled", f->enabled),
|
||||
SD_JSON_BUILD_PAIR_CONDITION(suggested >= 0, "suggested", SD_JSON_BUILD_BOOLEAN(suggested > 0)),
|
||||
JSON_BUILD_PAIR_STRV_NON_EMPTY("transfers", transfers));
|
||||
|
||||
@@ -1423,7 +1423,7 @@ static int describe_feature(sd_bus *bus, const char *feature, Feature *ret) {
|
||||
{ "enabled", SD_JSON_VARIANT_BOOLEAN, sd_json_dispatch_stdbool, offsetof(Feature, enabled), SD_JSON_MANDATORY },
|
||||
{ "suggested", SD_JSON_VARIANT_BOOLEAN, sd_json_dispatch_tristate, offsetof(Feature, suggested), SD_JSON_NULLABLE },
|
||||
{ "documentation", SD_JSON_VARIANT_ARRAY, sd_json_dispatch_strv, offsetof(Feature, documentation), SD_JSON_NULLABLE },
|
||||
{ "appstream", SD_JSON_VARIANT_STRING, sd_json_dispatch_string, offsetof(Feature, appstream), SD_JSON_NULLABLE },
|
||||
{ "appStream", SD_JSON_VARIANT_STRING, sd_json_dispatch_string, offsetof(Feature, appstream), SD_JSON_NULLABLE },
|
||||
{ "transfers", SD_JSON_VARIANT_ARRAY, sd_json_dispatch_strv, offsetof(Feature, transfers), SD_JSON_NULLABLE },
|
||||
{}
|
||||
};
|
||||
|
||||
@@ -509,7 +509,7 @@ EOF
|
||||
' <<<"$feature_json" >/dev/null
|
||||
jq -e '.enabled == false' <<<"$feature_json" >/dev/null
|
||||
jq -e '.suggested == false' <<<"$feature_json" >/dev/null
|
||||
jq -e '.appstream == "https://example.com/optional.appstream.xml"' <<<"$feature_json" >/dev/null
|
||||
jq -e '.appStream == "https://example.com/optional.appstream.xml"' <<<"$feature_json" >/dev/null
|
||||
|
||||
suggested_json="$("$SYSUPDATE" --json=short features suggested)"
|
||||
jq -e '.id == "suggested" and .suggested == true' <<<"$suggested_json" >/dev/null
|
||||
|
||||
Reference in New Issue
Block a user