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,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
|
||||
|
||||
|
|
@ -19,13 +19,10 @@
|
|||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
#
|
||||
|
||||
VERSION=5
|
||||
VERSION=6
|
||||
|
||||
. ./config
|
||||
|
||||
# Add trisquel logo patch.
|
||||
patch_p1 $DATA/001_add_trisquel_gnome-boxes_logo.patch
|
||||
|
||||
remove_patch Update-recommended-downloads.patch
|
||||
|
||||
#Required dependencies not in upstream.
|
||||
|
|
@ -44,7 +41,6 @@ cat << recommended-os > data/recommended-downloads.xml
|
|||
-->
|
||||
<list>
|
||||
<os_id>http://trisquel.info/trisquel/11</os_id>
|
||||
<os_id>http://trisquel.info/trisquel/10</os_id>
|
||||
<os_id>http://guix.gnu.org/guix/1.3</os_id>
|
||||
<os_id>http://hyperbola.info/hyperbola/03</os_id>
|
||||
<os_id>http://pureos.net/pureos/8</os_id>
|
||||
|
|
@ -54,6 +50,9 @@ recommended-os
|
|||
# Remove gnome recommendation.
|
||||
grep -rl "<url>.*.iso.*</url>" data/osinfo/|xargs -r sed -i "/.iso/d"
|
||||
|
||||
# Apply patch_changes
|
||||
apply_patch_changes
|
||||
|
||||
changelog "Replace recommended downloads."
|
||||
|
||||
package
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue