#43 Write empty object if "extras" is empty
Merged 7 months ago by ngompa. Opened 7 months ago by jannau.
fedora-asahi/ jannau/kiwi-descriptions handle_empty_extras  into  rawhide

@@ -89,6 +89,11 @@ 

  

  openh264_rpms=$(rpmdistro-repoquery fedora "$release" gstreamer1-plugin-openh264 mozilla-openh264 openh264 --location)

  

+ if [ -e "${openh264_rpms}"]; then

+   extras="{}"

+ else

+   extras="$(printf '%s\n' "${openh264_rpms}" | newlineToJson)"

+ 

  cat > "${package}.json" <<EOF

  {

      "name": "Fedora Linux ${pretty_release}",
@@ -98,7 +103,7 @@ 

      "package": "${package}.zip",

      "icon": "fedora.icns",

      "supported_fw": ["13.5"],

-     "extras": $(printf '%s\n' "$openh264_rpms" | newlineToJson),

+     "extras": ${extras},

      "partitions": [

          {

              "name": "EFI",

Rawhide has no openh264 builds which results in writing an array with
an empty string as "extras" value. This breaks the installer.

rebased onto 402a8ff

7 months ago

Pull-Request has been merged by ngompa

7 months ago
Metadata