From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 2 Mar 2018 11:06:32 +0000 (+0100)
Subject: tools/hwdb-update: allow downloads to fail
X-Git-Tag: v238~15^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=299597f8d5f06fc0faa3600f3c5181b58c25b922;p=thirdparty%2Fsystemd.git

tools/hwdb-update: allow downloads to fail

sf.net is down, and linux-usb.org which is hosted there also fails.
That's not nice, but there's not we can do about it now.
---

diff --git a/tools/meson-hwdb-update.sh b/tools/meson-hwdb-update.sh
index 6f8f0caed2b..d4ec555beb3 100755
--- a/tools/meson-hwdb-update.sh
+++ b/tools/meson-hwdb-update.sh
@@ -3,8 +3,16 @@ set -eu
 
 cd "$1"
 
+unset permissive
+if [ "$2" = "-p" ]; then
+        permissive=1
+        shift
+fi
+
 if [ "${2:-}" != "-n" ]; then (
+        [ -z "$permissive" ] || set +e
         set -x
+
         curl -L -o usb.ids 'http://www.linux-usb.org/usb.ids'
         curl -L -o pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids'
         curl -L -o ma-large.txt 'http://standards-oui.ieee.org/oui/oui.txt'