Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sca-server-report for
openSUSE:Factory checked in at 2021-06-01 10:37:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sca-server-report (Old)
and /work/SRC/openSUSE:Factory/.sca-server-report.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sca-server-report"
Tue Jun 1 10:37:18 2021 rev:5 rq:895604 version:1.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/sca-server-report/sca-server-report.changes
2020-12-15 14:51:34.406752244 +0100
+++
/work/SRC/openSUSE:Factory/.sca-server-report.new.1898/sca-server-report.changes
2021-06-01 10:38:21.308904308 +0200
@@ -1,0 +2,12 @@
+Tue May 25 23:55:37 UTC 2021 - Jason Record <[email protected]>
+
+- Fixed sca report header supportconfig file (bsc#1186442)
+- Fixed report file output path (bsc#1180894)
+- Removed preprocessor elements for OES Filr eDir (bsc#1186420)
+
+-------------------------------------------------------------------
+Thu May 20 19:41:18 UTC 2021 - Jason Record <[email protected]>
+
+- Changed absolute paths to relative ones (bsc#1186316)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sca-server-report.spec ++++++
--- /var/tmp/diff_new_pack.HOwodz/_old 2021-06-01 10:38:21.832905200 +0200
+++ /var/tmp/diff_new_pack.HOwodz/_new 2021-06-01 10:38:21.836905207 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sca-server-report
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ sca-server-report-1.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-server-report-1.0.1/bin/scatool.py
new/sca-server-report-1.0.1/bin/scatool.py
--- old/sca-server-report-1.0.1/bin/scatool.py 2020-12-03 18:17:35.112076017
+0100
+++ new/sca-server-report-1.0.1/bin/scatool.py 2021-05-26 01:39:03.677031005
+0200
@@ -1,9 +1,9 @@
##############################################################################
# scatool.py - Supportconfig Analysis (SCA) Tool
-# Copyright (c) 2014-2020 SUSE LLC
+# Copyright (c) 2014-2021 SUSE LLC
#
# Description: Runs and analyzes local or remote supportconfigs
-# Modified: 2020 Nov 06
+# Modified: 2021 May 25
##############################################################################
#command
@@ -20,11 +20,11 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# Authors/Contributors:
-# David Hamner ([email protected])
-# Jason Record ([email protected])
+# Jason Record <[email protected]>
+# David Hamner <[email protected]>
#
##############################################################################
-SVER = '1.0.9-6'
+SVER = '1.0.9-11'
##########################################################################################
# Python Imports
@@ -196,10 +196,7 @@
#reset variables
DISTRO = 0
supportconfigVersion = ""
- oesVersion = ""
- oesPatchLevel = ""
OS = ""
- OES = ""
INFO = ""
VER = ""
osArch = ""
@@ -233,8 +230,6 @@
IN_UNAME = False
IN_OS_RELEASE = False
IN_SUSE_RELEASE = False
- IN_OES_RELEASE = False
- IN_FILR = False
for line in BASIC_ENV:
if "Script Version:" in line:
supportconfigVersion = line.split(':')[-1].strip()
@@ -252,10 +247,6 @@
IN_OS_RELEASE = True
elif "/etc/SuSE-release" in line:
IN_SUSE_RELEASE = True
- elif "/etc/novell-release" in line:
- IN_OES_RELEASE = True
- elif "/etc/Novell-VA-release" in line:
- IN_FILR = True
elif( IN_DATE ):
if "#==[" in line:
IN_DATE = False
@@ -328,30 +319,6 @@
patchLevel =
line.split('=')[-1].replace('"', '').strip()
else:
OS = line.strip()
- elif( IN_OES_RELEASE):
- if "#==[" in line:
- IN_OES_RELEASE = False
- PRODUCTS.insert(1, ['Product:', OES, 'Service
Pack:', oesPatchLevel])
- else:
- if( len(OES) > 0 ):
- if line.lower().startswith("version"):
- OESVersion =
line.split('=')[-1].strip().split('.')[0]
- elif
line.lower().startswith("patchlevel"):
- oesPatchLevel =
line.split('=')[-1].strip()
- else:
- OES = line.strip()
- elif( IN_FILR ):
- if "#==[" in line:
- IN_FILR = False
- if( INFO and VER ):
- PRODUCTS.append(['Product:', INFO,
'Version:', VER])
- INFO = ""
- VER = ""
- else:
- if line.lower().startswith("product"):
- INFO = line.split('=')[-1].strip()
- elif line.lower().startswith("version"):
- VER = line.split('=')[-1].strip()
del BASIC_ENV
@@ -791,16 +758,8 @@
patternPackage =
'sca-patterns-sle10'
elif 'sle9' in
patternRelativePath:
patternPackage =
'sca-patterns-sle09'
- elif 'OES' in patternRelativePath:
- patternPackage =
'sca-patterns-oes'
elif 'HAE' in patternRelativePath:
patternPackage =
'sca-patterns-hae'
- elif 'edirectory' in
patternRelativePath:
- patternPackage =
'sca-patterns-edir'
- elif 'filr' in patternRelativePath:
- patternPackage =
'sca-patterns-filr'
- elif 'groupwise' in patternRelativePath:
- patternPackage =
'sca-patterns-groupwise'
patternSourceURL =
'https://github.com/g23guy/' + patternPackage + '/blob/master/' +
patternRelativePath
#put it in html form
@@ -926,15 +885,11 @@
print "Total Patterns Available: " + str(TOTAL_COUNT)
#first get the pattern directory paths for all possible valid patterns
- #build directory with SLE and OES versions from basic-environment.txt
+ #build directory with SLE versions from basic-environment.txt
basicEnv = open(extractedSupportconfig + "/basic-environment.txt")
basicEnvLines = basicEnv.readlines()
SLE_VERSION = 0
SLE_SP = 0
- OES_VERSION = 0
- OES_SP = 0
- inOES = False
- notOES = True
inSLES = False
inSLESOS = False
for lineNumber in range(0, len(basicEnvLines)):
@@ -955,29 +910,13 @@
SLE_VERSION =
basicEnvLines[lineNumber].split("=")[1].strip()
elif basicEnvLines[lineNumber].startswith("PATCHLEVEL"):
SLE_SP =
basicEnvLines[lineNumber].split("=")[1].strip()
- elif inOES:
- if "#==[" in basicEnvLines[lineNumber] :
- inOES = False
- elif "Open Enterprise" in basicEnvLines[lineNumber]:
- notOES = False
- elif basicEnvLines[lineNumber].startswith("VERSION"):
- OES_VERSION =
basicEnvLines[lineNumber].split("=")[1].strip().split(".")[0]
- elif basicEnvLines[lineNumber].startswith("PATCHLEVEL"):
- OES_SP =
basicEnvLines[lineNumber].split("=")[1].strip()
- elif "# /etc/SuSE-release" in basicEnvLines[lineNumber] :
- inSLES = True
elif "# /etc/os-release" in basicEnvLines[lineNumber] :
inSLESOS = True
- elif "# /etc/novell-release" in basicEnvLines[lineNumber] :
- inOES = True
- if notOES:
- OES_VERSION = 0
+ elif "# /etc/SuSE-release" in basicEnvLines[lineNumber] :
+ inSLES = True
if( SLE_VERSION > 0 ):
patternDirectories.append(str(SCA_PATTERN_PATH) + "/SLE/sle" +
str(SLE_VERSION) + "all/")
patternDirectories.append(str(SCA_PATTERN_PATH) + "/SLE/sle" +
str(SLE_VERSION) + "sp" + str(SLE_SP) + "/")
- if( OES_VERSION > 0 ):
- patternDirectories.append(str(SCA_PATTERN_PATH) + "/OES/oes" +
str(OES_VERSION) + "all/")
- patternDirectories.append(str(SCA_PATTERN_PATH) + "/OES/oes" +
str(OES_VERSION) + "sp" + str(OES_SP) + "/")
#build directory of additional required patterns by add-on products
rpmFile = open(extractedSupportconfig + "/rpm.txt")
@@ -988,14 +927,6 @@
for line in RPMs:
if inHAE.search(line) and not line.startswith("sca-patterns"):
patternDirectories.append(str(SCA_PATTERN_PATH +
"/HAE/"))
- elif "ndsserv " in line.lower() and not
line.startswith("sca-patterns"):
- patternDirectories.append(str(SCA_PATTERN_PATH +
"/edirectory/"))
- elif "groupwise" in line.lower() and not
line.startswith("sca-patterns"):
- patternDirectories.append(str(SCA_PATTERN_PATH +
"/groupwise/"))
- elif "datasync-common " in line.lower() and not
line.startswith("sca-patterns"):
- patternDirectories.append(str(SCA_PATTERN_PATH +
"/groupwise/"))
- elif "filr-famtd " in line.lower() and not
line.startswith("sca-patterns"):
- patternDirectories.append(str(SCA_PATTERN_PATH +
"/filr/"))
elif SUMA.search(line) and not line.startswith("sca-patterns"):
VER_MAJOR = str(line.split()[-1].split('.')[0])
VER_MINOR = str(line.split()[-1].split('.')[1])
@@ -1224,7 +1155,7 @@
# options - tar extraction args
def extractFile(archive, options):
print "Extracting File: " + archive
- process = subprocess.Popen(["/usr/bin/tar", options, archive],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ process = subprocess.Popen(["tar", options, archive],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = process.communicate()
rc = process.returncode
if( rc > 0 ):
@@ -1286,7 +1217,7 @@
# print "supportconfigPath = " + supportconfigPath
try:
- p = subprocess.Popen(['/sbin/supportconfig', "-bB" +
localSupportconfigName, "-t " + localSupportconfigPath],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ p = subprocess.Popen(['supportconfig', "-bB" +
localSupportconfigName, "-t " + localSupportconfigPath],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
#if we cannot run supportconfig
except Exception:
print >> sys.stderr, "Error: Cannot run supportconfig."
@@ -1360,7 +1291,7 @@
removeSupportconfigDir = False
else:
print "Supportconfig Remote Server: %s" %
givenSupportconfigPath
- ping_server = subprocess.Popen(["/bin/ping", "-c1 -w1",
givenSupportconfigPath], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ ping_server = subprocess.Popen(["ping", "-c1 -w1",
givenSupportconfigPath], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = ping_server.communicate()
if ping_server.returncode != 0:
print >> sys.stderr, " Error: Cannot ping
remote server"
@@ -1492,6 +1423,7 @@
return
else:
supportconfigPath = givenSupportconfigPath
+ supportconfigPath = supportconfigPath.rstrip("/")
OS_PATH = os.environ["PWD"]
if( len(OS_PATH) > 0 ):
@@ -1517,11 +1449,14 @@
#if given a supportconfig archive
if os.path.isfile(supportconfigPath):
# print "Evaluating File: " + supportconfigPath
+ if( len(outputPath) > 0 ):
+ htmlOutputFile = outputPath + "/" +
extractedSupportconfig.strip("/").split("/")[-1] + "_report.html"
+
#extract file
#set TarFile and find the path of the soon to be extracted
supportconfig
fileInfo = os.stat(supportconfigPath)
if( fileInfo.st_size > 0 ):
- process = subprocess.Popen(["/usr/bin/file", "--brief",
"--mime-type", supportconfigPath], stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
+ process = subprocess.Popen(["file", "--brief",
"--mime-type", supportconfigPath], stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
stdout, stderr = process.communicate()
# print "Detected File Type: " + stdout
if re.search("/x-xz", stdout):
@@ -1568,6 +1503,7 @@
#if given an extracted supportconfig directory
elif os.path.isdir(supportconfigPath):
+# print(" + Directory outputPath = " + outputPath)
extractedSupportconfig = supportconfigPath
if( len(outputPath) > 0 ):
htmlOutputFile = outputPath + "/" +
extractedSupportconfig.strip("/").split("/")[-1] + "_report.html"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-server-report-1.0.1/man/scatool.conf.5
new/sca-server-report-1.0.1/man/scatool.conf.5
--- old/sca-server-report-1.0.1/man/scatool.conf.5 2020-11-06
18:12:52.559827711 +0100
+++ new/sca-server-report-1.0.1/man/scatool.conf.5 2021-05-25
22:16:36.215786266 +0200
@@ -1,4 +1,4 @@
-.TH SCATOOL.CONF 5 "2020 Nov 06" "sca-server-report" "Supportconfig Analysis
Manual"
+.TH SCATOOL.CONF 5 "2021 May 25" "sca-server-report" "Supportconfig Analysis
Manual"
.SH NAME
scatool.conf - Supportconfig Analysis Tool Configuration File
.SH DESCRIPTION
@@ -15,7 +15,7 @@
.RE
.TP
OUTPUT_PATH
-The directory where HTML report and supportconfig archive files are saved.
+The directory where the HTML report file is saved.
.RS
Default: (Empty)
.RE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sca-server-report-1.0.1/spec/sca-server-report.changes
new/sca-server-report-1.0.1/spec/sca-server-report.changes
--- old/sca-server-report-1.0.1/spec/sca-server-report.changes 2020-11-12
16:30:23.479948745 +0100
+++ new/sca-server-report-1.0.1/spec/sca-server-report.changes 2021-05-26
01:57:16.423176066 +0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Tue May 25 23:55:37 UTC 2021 - Jason Record <[email protected]>
+
+- Fixed sca report header supportconfig file (bsc#1186442)
+- Fixed report file output path (bsc#1180894)
+- Removed preprocessor elements for OES Filr eDir (bsc#1186420)
+
+-------------------------------------------------------------------
+Thu May 20 19:41:18 UTC 2021 - Jason Record <[email protected]>
+
+- Changed absolute paths to relative ones (bsc#1186316)
+
+-------------------------------------------------------------------
Thu Nov 12 15:29:10 UTC 2020 - [email protected]
- Additional to version 1.0.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-server-report-1.0.1/spec/sca-server-report.spec
new/sca-server-report-1.0.1/spec/sca-server-report.spec
--- old/sca-server-report-1.0.1/spec/sca-server-report.spec 2020-11-12
16:30:25.567909424 +0100
+++ new/sca-server-report-1.0.1/spec/sca-server-report.spec 2021-05-26
01:57:40.578520187 +0200
@@ -1,6 +1,6 @@
# spec file for package sca-server-report
#
-# Copyright (c) 2017-2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017-2021 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
