gnome-boxes: fix issue for empty distro list
This commit is contained in:
parent
4311064c97
commit
9cf0c9f7bc
3 changed files with 34 additions and 5 deletions
|
|
@ -0,0 +1,29 @@
|
|||
diff --git a/data/osinfo/meson.build b/data/osinfo/meson.build
|
||||
index acf27962..158af16b 100644
|
||||
--- a/data/osinfo/meson.build
|
||||
+++ b/data/osinfo/meson.build
|
||||
@@ -16,7 +16,8 @@ osinfo_db = [
|
||||
['popos-17.10.xml', 'gnome-boxes/osinfo/os/system76.com'],
|
||||
['rhel-8.0.xml', 'gnome-boxes/osinfo/os/redhat.com'],
|
||||
['rocky-8.4.xml', 'gnome-boxes/osinfo/os/rockylinux.org'],
|
||||
- ['silverblue-28.xml', 'gnome-boxes/osinfo/os/fedoraproject.org']
|
||||
+ ['silverblue-28.xml', 'gnome-boxes/osinfo/os/fedoraproject.org'],
|
||||
+ ['trisquel-9.xml', 'gnome-boxes/osinfo/os/trisquel.info']
|
||||
]
|
||||
|
||||
foreach os: osinfo_db
|
||||
diff --git a/data/osinfo/trisquel-11.xml b/data/osinfo/trisquel-11.xml
|
||||
new file mode 100644
|
||||
index 00000000..ce9b4b36
|
||||
--- /dev/null
|
||||
+++ b/data/osinfo/trisquel-9.xml
|
||||
@@ -0,0 +1,9 @@
|
||||
+<libosinfo version="0.0.1">
|
||||
+
|
||||
+ <!-- Please read https://gitlab.gnome.org/GNOME/gnome-boxes-logos/-/raw/master/README.md for any questions about usage of product logos in Boxes. !-->
|
||||
+
|
||||
+ <os id="http://trisquel.info/trisquel/9">
|
||||
+ <logo>https://gitlab.gnome.org/GNOME/gnome-boxes-logos/-/raw/master/logos/trisquel.svg</logo>
|
||||
+ </os>
|
||||
+
|
||||
+</libosinfo>
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
From 333dfad568ba77456ff3b00e6c2750d6a2cf0d73 Mon Sep 17 00:00:00 2001
|
||||
From: Felipe Borges <felipeborges@gnome.org>
|
||||
Date: Wed, 10 Aug 2022 09:54:41 +0200
|
||||
Subject: [PATCH] util-app: Make recommended-downloads parsing handle empty
|
||||
media lists
|
||||
|
||||
---
|
||||
src/util-app.vala | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/util-app.vala b/src/util-app.vala
|
||||
index c0a42a94d..c5f47ae22 100644
|
||||
--- a/src/util-app.vala
|
||||
+++ b/src/util-app.vala
|
||||
@@ -250,7 +250,11 @@ private async GLib.List<Osinfo.Media>? parse_recommended_downloads_file (string
|
||||
continue;
|
||||
}
|
||||
|
||||
- var media = os.get_media_list ().get_nth (0) as Osinfo.Media;
|
||||
+ var media_list = os.get_media_list ();
|
||||
+ if (media_list == null || media_list.get_length () == 0)
|
||||
+ continue;
|
||||
+
|
||||
+ var media = media_list.get_nth (0) as Osinfo.Media;
|
||||
if (media.url != null || os_id.has_prefix ("http://redhat.com"))
|
||||
list.append (media);
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue