From: Jason Ish <ish@unx.ca>
Date: Tue, 5 Dec 2017 23:18:11 +0000 (-0600)
Subject: fix getting cpu on certain platforms
X-Git-Tag: 1.0.0b1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b515011bc047ecc6e395cb0c69cad9a2eaa6d5d;p=thirdparty%2Fsuricata-update.git

fix getting cpu on certain platforms

use platform.machine() instead of platform.processor() as its
more reliable
---

diff --git a/suricata/update/net.py b/suricata/update/net.py
index 62620b8..f89a4ca 100644
--- a/suricata/update/net.py
+++ b/suricata/update/net.py
@@ -18,6 +18,7 @@
 """ Module for network related operations. """
 
 import platform
+import logging
 
 try:
     # Python 3.3...
@@ -30,6 +31,8 @@ except ImportError:
 
 from suricata.update.version import version
 
+logger = logging.getLogger()
+
 # Number of bytes to read at a time in a GET request.
 GET_BLOCK_SIZE = 8192
 
@@ -45,7 +48,7 @@ def build_user_agent():
     uname_system = platform.uname()[0]
 
     params.append("OS: %s" % (uname_system))
-    params.append("CPU: %s" % (platform.processor()))
+    params.append("CPU: %s" % (platform.machine()))
     params.append("Python: %s" % (platform.python_version()))
 
     if uname_system == "Linux":
@@ -74,6 +77,7 @@ def get(url, fileobj, progress_hook=None):
     """
 
     user_agent = build_user_agent()
+    logger.debug("Setting HTTP user-agent to %s", user_agent)
 
     opener = build_opener()
     opener.addheaders = [