pmbootstrap: install: do not fail on alpine-appstream-downloader error v1 APPLIED

Pablo Correa Gómez: 1
 install: do not fail on alpine-appstream-downloader error

 1 files changed, 6 insertions(+), 6 deletions(-)

[PATCH pmbootstrap] install: do not fail on alpine-appstream-downloader error Export this patch

From: Pablo Correa Gómez <ablocorrea@hotmail.com>

Having AppStream data is great for installation that make use of GNOME
Software or KDE Discover, however it's not a must. The generation of
AppStream data in alpine (which we maintain) is still certainly
improvable, and we have bumped into problems, unreliabilities and such
from time to time. Installations without AppStream data are
totally functional, even if the first experience on those apps is not
the best. Still, users are one refresh away on Software or Discover
from getting such data downloaded. So failing to generate installations
for this reason is unnecessarily breaking.

Signed-off-by: Pablo Correa Gómez <ablocorrea@hotmail.com>

Oliver Smith <ollieparanoid@postmarketos.org>

1 year, 3 months ago

Reviewed-by: Oliver Smith <ollieparanoid@postmarketos.org>

We might want to change this later on to have it branch specific, but
given that we want to build v23.12 images now, it's a good fix.
Thanks!

---
 pmb/install/_install.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pmb/install/_install.py b/pmb/install/_install.py
index 2a568ed4..1adfe789 100644
--- a/pmb/install/_install.py
+++ b/pmb/install/_install.py
@@ -414,12 +414,12 @@ def setup_appstream(args):
     if "alpine-appstream-downloader" not in installed_pkgs or args.offline:
         return
 
-    pmb.chroot.root(args, ["alpine-appstream-downloader",
-                           "/mnt/appstream-data"], suffix)
-    pmb.chroot.root(args, ["mkdir", "-p", "/var/lib/swcatalog"], suffix)
-    pmb.chroot.root(args, ["cp", "-r", "/mnt/appstream-data/icons",
-                           "/mnt/appstream-data/xml",
-                           "-t", "/var/lib/swcatalog"], suffix)
+    if not pmb.chroot.root(args, ["alpine-appstream-downloader",
+                                  "/mnt/appstream-data"], suffix, check=False):
+        pmb.chroot.root(args, ["mkdir", "-p", "/var/lib/swcatalog"], suffix)
+        pmb.chroot.root(args, ["cp", "-r", "/mnt/appstream-data/icons",
+                               "/mnt/appstream-data/xml",
+                               "-t", "/var/lib/swcatalog"], suffix)
 
 
 def disable_sshd(args):

base-commit: 4fb61591e8f37402fc8dbb930c2585f11f6023e9
-- 
2.43.0

builds.sr.ht <builds@sr.ht>

1 year, 3 months ago

pmbootstrap/patches/.build.yml: SUCCESS in 18m10s

[install: do not fail on alpine-appstream-downloader error][0] from [Pablo Correa Gómez][1]

[0]: https://lists.sr.ht/~postmarketos/pmbootstrap-devel/patches/47400
[1]: mailto:pabloyoyoista@postmarketos.org

✓ #1108404 SUCCESS pmbootstrap/patches/.build.yml https://builds.sr.ht/~postmarketos/job/1108404

Oliver Smith <ollieparanoid@postmarketos.org>

1 year, 3 months ago

Applied, thanks!

[1/1] install: do not fail on alpine-appstream-downloader error
      commit: 38ae6120bba10022966a4effbbca6ca1e5879d65

Best regards