Hello community,
here is the log from the commit of package sca-patterns-base for
openSUSE:Factory checked in at 2020-12-16 11:01:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sca-patterns-base (Old)
and /work/SRC/openSUSE:Factory/.sca-patterns-base.new.2328 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sca-patterns-base"
Wed Dec 16 11:01:40 2020 rev:2 rq:856086 version:1.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/sca-patterns-base/sca-patterns-base.changes
2018-01-06 18:52:37.493599822 +0100
+++
/work/SRC/openSUSE:Factory/.sca-patterns-base.new.2328/sca-patterns-base.changes
2020-12-16 11:01:41.727641089 +0100
@@ -1,0 +2,7 @@
+Fri Nov 6 22:35:01 UTC 2020 - jason.rec...@suse.com
+
+- Additions to version 1.3.1
+ + SUSE.getHostInfo doesn't use /etc/os-release (bsc#1178523)
+ + SUSE.py missing initial kernel version constants (bsc#1178524)
+
+-------------------------------------------------------------------
Old:
----
sca-patterns-base-1.3.tar.gz
New:
----
sca-patterns-base-1.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sca-patterns-base.spec ++++++
--- /var/tmp/diff_new_pack.jWIUOw/_old 2020-12-16 11:01:42.435641784 +0100
+++ /var/tmp/diff_new_pack.jWIUOw/_new 2020-12-16 11:01:42.435641784 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sca-patterns-base
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,6 +12,10 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
%define sca_common sca
%define patdirbase %{_prefix}/lib/%{sca_common}
%define patdir %{patdirbase}/patterns
@@ -20,16 +24,16 @@
%define patgrp root
Name: sca-patterns-base
-Version: 1.3
+Version: 1.3.1
Release: 0
Summary: Supportconfig Analysis Pattern Base Libraries
-License: GPL-2.0
-URL: https://github.com/g23guy/sca-patterns-base
+License: GPL-2.0-only
Group: System/Monitoring
+URL: https://github.com/g23guy/sca-patterns-base
Source: %{name}-%{version}.tar.gz
-Requires: python
Requires: bash
Requires: perl
+Requires: python
BuildArch: noarch
%description
++++++ sca-patterns-base-1.3.tar.gz -> sca-patterns-base-1.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-patterns-base-1.3/libraries/python/SUSE.py
new/sca-patterns-base-1.3.1/libraries/python/SUSE.py
--- old/sca-patterns-base-1.3/libraries/python/SUSE.py 2017-06-03
02:07:42.946616987 +0200
+++ new/sca-patterns-base-1.3.1/libraries/python/SUSE.py 2020-11-06
23:32:19.517254469 +0100
@@ -4,7 +4,7 @@
Library of functions for creating python patterns specific to SUSE
"""
##############################################################################
-# Copyright (C) 2013-2017 SUSE LLC
+# Copyright (C) 2013-2020 SUSE LLC
##############################################################################
#
# This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
# Jason Record (jason.rec...@suse.com)
# David Hamner (ke7...@gmail.com)
#
-# Modified: 2017 Jun 02
+# Modified: 2020 Nov 06
#
##############################################################################
@@ -39,28 +39,36 @@
SLE9SP2 = '2.6.5-7.191'
SLE9SP3 = '2.6.5-7.244'
SLE9SP4 = '2.6.5-7.308'
-SLE9SP5 = '2.6.5-8' #Update to actual version when applicable
+SLE9SP5 = '2.6.5-8'
SLE10GA = '2.6.16.21-0.8'
SLE10SP0 = '2.6.16.21-0.8'
SLE10SP1 = '2.6.16.46-0.12'
SLE10SP2 = '2.6.16.60-0.21'
SLE10SP3 = '2.6.16.60-0.54.5'
SLE10SP4 = '2.6.16.60-0.85.1'
-SLE10SP5 = '2.6.17' #Update to actual version when applicable
+SLE10SP5 = '2.6.17'
SLE11GA = '2.6.27.19-5'
SLE11SP0 = '2.6.27.19-5'
SLE11SP1 = '2.6.32.12-0.7'
SLE11SP2 = '3.0.13-0.27'
SLE11SP3 = '3.0.76-0.11.1'
SLE11SP4 = '3.0.101-0.63.1'
-SLE11SP5 = '3.1' #Update to actual version when applicable
+SLE11SP5 = '3.1' #Update to actual version when/if applicable
SLE12GA = '3.12.28-4'
SLE12SP0 = '3.12.28-4'
SLE12SP1 = '3.12.49-11.1'
SLE12SP2 = '4.4.21-69'
-SLE12SP3 = '4.4.68-2' #Beta3: Update to actual version when applicable
-SLE12SP4 = '5.999' #Update to actual version when applicable
-SLE12SP5 = '6.999' #Update to actual version when applicable
+SLE12SP3 = '4.4.73-5.1'
+SLE12SP4 = '4.12.14-94.41'
+SLE12SP5 = '4.12.14-120.1'
+SLE15GA = '4.12.14-23.1'
+SLE15SP0 = '4.12.14-23.1'
+SLE15SP1 = '4.12.14-195.1'
+SLE15SP2 = '5.3.18-22.2'
+SLE15SP3 = '5.993' #Update to actual version when/if applicable
+SLE15SP4 = '5.994' #Update to actual version when/if applicable
+SLE15SP5 = '5.995' #Update to actual version when/if applicable
+
def packageInstalled(PackageName):
"""
@@ -659,9 +667,12 @@
IDX_VERSION = 2
IDX_PATCHLEVEL = 1
IDX_DISTRO = 0
- IDX_ARCH = 1
+ IDX_OSDISTRO = 1
+ IDX_ARCH = -2
IDX_VALUE = 1
+ IDX_MAJOR = 0
UNAME_FOUND = False
+ OSRELEASE_FOUND = False
RELEASE_FOUND = False
NOVELL_FOUND = False
RELEASE_LINE = 0
@@ -672,6 +683,7 @@
# print "getHostInfo: Error opening file: %s" % error
Core.updateStatus(Core.ERROR, "ERROR: Cannot open " + FILE_OPEN)
+ OSRELEASE = re.compile('/etc/os-release', re.IGNORECASE)
RELEASE = re.compile('/etc/SuSE-release', re.IGNORECASE)
NOVELL = re.compile('/etc/novell-release', re.IGNORECASE)
OES = re.compile('Open Enterprise Server', re.IGNORECASE)
@@ -679,14 +691,28 @@
if UNAME_FOUND:
SERVER_DICTIONARY['Hostname'] =
LINE.split()[IDX_HOSTNAME]
SERVER_DICTIONARY['KernelVersion'] =
LINE.split()[IDX_VERSION]
+ SERVER_DICTIONARY['Architecture'] =
LINE.split()[IDX_ARCH]
UNAME_FOUND = False
+ elif OSRELEASE_FOUND:
+ RELEASE_LINE += 1
+ if "#==[" in LINE:
+ RELEASE_FOUND = False
+ elif LINE.startswith('VERSION_ID'):
+ VERSION_ID_INFO = LINE.replace('"',
"").strip().split('=')[IDX_VALUE].split('.')
+ if( len(VERSION_ID_INFO) > 1 ):
+ SERVER_DICTIONARY['DistroVersion'] =
int(VERSION_ID_INFO[IDX_MAJOR].strip('"'))
+ SERVER_DICTIONARY['DistroPatchLevel'] =
int(VERSION_ID_INFO[IDX_PATCHLEVEL].strip('"'))
+ else:
+ SERVER_DICTIONARY['DistroVersion'] =
int(VERSION_ID_INFO[IDX_MAJOR].strip('"'))
+ SERVER_DICTIONARY['DistroPatchLevel'] = 0
+ elif LINE.startswith('PRETTY_NAME'):
+ SERVER_DICTIONARY['Distro'] = re.split(r'=',
LINE)[IDX_OSDISTRO].strip()
elif RELEASE_FOUND:
RELEASE_LINE += 1
if "#==[" in LINE:
RELEASE_FOUND = False
elif ( RELEASE_LINE == 1 ):
SERVER_DICTIONARY['Distro'] =
re.split(r'\(|\)', LINE)[IDX_DISTRO].strip()
- SERVER_DICTIONARY['Architecture'] =
re.split(r'\(|\)', LINE)[IDX_ARCH].strip()
else:
if LINE.startswith('VERSION'):
SERVER_DICTIONARY['DistroVersion'] =
int(LINE.split('=')[IDX_VALUE].strip())
@@ -709,6 +735,8 @@
SERVER_DICTIONARY['OESPatchLevel'] = int(ValueString)
elif "uname -a" in LINE:
UNAME_FOUND = True
+ elif OSRELEASE.search(LINE):
+ OSRELEASE_FOUND = True
elif RELEASE.search(LINE):
RELEASE_FOUND = True
elif NOVELL.search(LINE):
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
