From: Jason Ish <jason.ish@oisf.net>
Date: Fri, 15 Apr 2022 15:24:58 +0000 (-0600)
Subject: Better URL fail message on with --fail.
X-Git-Tag: 1.3.0rc1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c90c5daf89da9b2cdfd1cd6c47fbc6f2c6eefb6;p=thirdparty%2Fsuricata-update.git

Better URL fail message on with --fail.

If --fail, we wil not use the cached version.
---

diff --git a/suricata/update/main.py b/suricata/update/main.py
index 9b2b177..a0dd880 100644
--- a/suricata/update/main.py
+++ b/suricata/update/main.py
@@ -198,10 +198,10 @@ class Fetch:
             tmp_fileobj.close()
         except URLError as err:
             if os.path.exists(tmp_filename):
-                msg = "Failed to fetch {}, will use latest cached version: {}".format(url, err)
-                if conf.args().fail:
-                    strict_error(msg)
-                logger.warning(msg)
+                if config.args().fail:
+                    strict_error("Failed to fetch {}: {}".format(url, err))
+                else:
+                    logger.error("Failed to fetch {}, will use latest cached version: {}".format(url, err))
                 return self.extract_files(tmp_filename)
             raise err
         except IOError as err: