Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sca-patterns-base for openSUSE:Factory checked in at 2021-11-05 22:58:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sca-patterns-base (Old) and /work/SRC/openSUSE:Factory/.sca-patterns-base.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sca-patterns-base" Fri Nov 5 22:58:30 2021 rev:8 rq:929475 version:1.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sca-patterns-base/sca-patterns-base.changes 2021-10-12 21:50:38.163981899 +0200 +++ /work/SRC/openSUSE:Factory/.sca-patterns-base.new.1890/sca-patterns-base.changes 2021-11-05 22:58:42.688285098 +0100 @@ -1,0 +2,6 @@ +Thu Nov 4 21:56:53 UTC 2021 - Jason Record <jason.rec...@suse.com> + +- Changes to updated version 1.5.0 + + Converted to python3 (bsc#1191005, SLE-21579) + +------------------------------------------------------------------- Old: ---- sca-patterns-base-1.3.3.tar.gz New: ---- sca-patterns-base-1.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sca-patterns-base.spec ++++++ --- /var/tmp/diff_new_pack.y6QXuv/_old 2021-11-05 22:58:44.540286237 +0100 +++ /var/tmp/diff_new_pack.y6QXuv/_new 2021-11-05 22:58:44.544286241 +0100 @@ -24,7 +24,7 @@ %define patgrp root Name: sca-patterns-base -Version: 1.3.3 +Version: 1.5.0 Release: 0 Summary: Supportconfig Analysis Pattern Base Libraries License: GPL-2.0-only @@ -33,7 +33,7 @@ Source: %{name}-%{version}.tar.gz Requires: bash Requires: perl -Requires: python-base +Requires: python3-base BuildArch: noarch %description ++++++ sca-patterns-base-1.3.3.tar.gz -> sca-patterns-base-1.5.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sca-patterns-base-1.3.3/libraries/python/Core.py new/sca-patterns-base-1.5.0/libraries/python/Core.py --- old/sca-patterns-base-1.3.3/libraries/python/Core.py 2021-06-10 21:35:02.370773202 +0200 +++ new/sca-patterns-base-1.5.0/libraries/python/Core.py 2021-11-04 22:59:21.457946104 +0100 @@ -121,7 +121,7 @@ global OVERALL global OVERALL_INFO global OTHER_LINKS - print "META_CLASS" + "=" + META_CLASS + "|" + "META_CATEGORY" + "=" + META_CATEGORY + "|" + "META_COMPONENT" + "=" + META_COMPONENT + "|" + "PATTERN_ID" + "=" + PATTERN_ID + "|" + "PRIMARY_LINK" + "=" + PRIMARY_LINK + "|" + "OVERALL" + "=" + str(OVERALL) + "|" + "OVERALL_INFO" + "=" + OVERALL_INFO + "|" + OTHER_LINKS + print("META_CLASS" + "=" + META_CLASS + "|" + "META_CATEGORY" + "=" + META_CATEGORY + "|" + "META_COMPONENT" + "=" + META_COMPONENT + "|" + "PATTERN_ID" + "=" + PATTERN_ID + "|" + "PRIMARY_LINK" + "=" + PRIMARY_LINK + "|" + "OVERALL" + "=" + str(OVERALL) + "|" + "OVERALL_INFO" + "=" + OVERALL_INFO + "|" + OTHER_LINKS) def updateStatus(overAll, overAllInfo): """ @@ -237,7 +237,7 @@ try: FILE = open(path + "/" + FILE_OPEN) - except Exception, error: + except Exception as error: updateStatus(ERROR, "ERROR: Cannot open " + FILE_OPEN + ": " + str(error)) for LINE in FILE: @@ -274,7 +274,7 @@ try: FILE = open(path + "/" + FILE_OPEN) - except Exception, error: + except Exception as error: updateStatus(ERROR, "ERROR: Cannot open " + FILE_OPEN + ": " + str(error)) SECTION = re.compile('^#==\[') @@ -297,7 +297,7 @@ try: FILE = os.stat(path + "/" + FILE_OPEN) - except Exception, error: + except Exception as error: # print "Error os.stat(" + str(FILE_OPEN) + "): " + str(error) return False @@ -338,7 +338,7 @@ global path try: FILE = open(path + "/" + FILE_OPEN) - except Exception, error: + except Exception as error: updateStatus(ERROR, "ERROR: Cannot open " + FILE_OPEN + ": " + str(error)) SectionTag = re.compile(SECTION) CommentedLine = re.compile('^#|^\s+#') @@ -395,7 +395,7 @@ global path try: FILE = open(path + "/" + FILE_OPEN) - except Exception, error: + except Exception as error: updateStatus(ERROR, "ERROR: Cannot open " + FILE_OPEN + ": " + str(error)) SectionTag = re.compile(SECTION) CommentedLine = re.compile('^#|^\s+#') @@ -451,7 +451,7 @@ global path try: FILE = open(path + "/" + FILE_OPEN) - except Exception, error: + except Exception as error: updateStatus(ERROR, "ERROR: Cannot open " + FILE_OPEN + ": " + str(error)) SectionTag = re.compile(SECTION) for line in FILE: @@ -502,7 +502,7 @@ global path try: FILE = open(path + "/" + FILE_OPEN) - except Exception, error: + except Exception as error: updateStatus(ERROR, "ERROR: Cannot open " + FILE_OPEN + ": " + str(error)) CommentedLine = re.compile('^#|^\s+#') for line in FILE: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sca-patterns-base-1.3.3/libraries/python/HAE.py new/sca-patterns-base-1.5.0/libraries/python/HAE.py --- old/sca-patterns-base-1.3.3/libraries/python/HAE.py 2021-03-02 23:56:40.437329507 +0100 +++ new/sca-patterns-base-1.5.0/libraries/python/HAE.py 2021-11-04 22:59:21.465945885 +0100 @@ -128,7 +128,7 @@ try: FILE = open(Core.path + "/" + FILE_OPEN) - except Exception, error: + except Exception as error: # print "Error opening file: %s" % error Core.updateStatus(Core.ERROR, "ERROR: Cannot open " + FILE_OPEN) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sca-patterns-base-1.3.3/libraries/python/MPIO.py new/sca-patterns-base-1.5.0/libraries/python/MPIO.py --- old/sca-patterns-base-1.3.3/libraries/python/MPIO.py 2021-03-02 23:56:40.437329507 +0100 +++ new/sca-patterns-base-1.5.0/libraries/python/MPIO.py 2021-11-04 22:59:21.473945667 +0100 @@ -170,7 +170,7 @@ #print "==Insert path_group_", D PATH_GROUP_VALUES = {} # prepend "path_group_" before each PATH_GROUP_VALUES key - for KEY in D.keys(): + for KEY in list(D.keys()): NEW_KEY = "path_group_" + str(KEY) PATH_GROUP_VALUES[NEW_KEY] = D[KEY] #print "KEY", KEY diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sca-patterns-base-1.3.3/libraries/python/SUSE.py new/sca-patterns-base-1.5.0/libraries/python/SUSE.py --- old/sca-patterns-base-1.3.3/libraries/python/SUSE.py 2021-08-16 23:18:17.193829412 +0200 +++ new/sca-patterns-base-1.5.0/libraries/python/SUSE.py 2021-11-04 22:59:21.481945449 +0100 @@ -265,17 +265,17 @@ """ Prints the entire list of dictionaries and the class variables. Used for debug purposes only. """ - print "Patch List:" + print("Patch List:") for patch in self.patchlist: - print " " + str(patch) - print "PatchInfo.valid " + str(self.valid) - print "PatchInfo.patch_count " + str(self.patch_count) - print "PatchInfo.patchCount " + str(PatchInfo.patchCount) - print "PatchInfo.search_name '" + str(self.search_name) + "'" - print "PatchInfo.patch_name '" + str(self.patch_name) + "'" - print "PatchInfo.installed " + str(self.installed) - print "PatchInfo.all_installed " + str(self.all_installed) - print "PatchInfo.needed " + str(self.needed) + print(" " + str(patch)) + print("PatchInfo.valid " + str(self.valid)) + print("PatchInfo.patch_count " + str(self.patch_count)) + print("PatchInfo.patchCount " + str(PatchInfo.patchCount)) + print("PatchInfo.search_name '" + str(self.search_name) + "'") + print("PatchInfo.patch_name '" + str(self.patch_name) + "'") + print("PatchInfo.installed " + str(self.installed)) + print("PatchInfo.all_installed " + str(self.all_installed)) + print("PatchInfo.needed " + str(self.needed)) def getDriverInfo( DRIVER_NAME ): """ @@ -578,7 +578,7 @@ # print "compareRPM: Version in Supportconfig = " + str(foundVersion) return Core.compareVersions(packageVersion, versionString) - except Exception, error: + except Exception as error: #error out... Core.updateStatus(Core.ERROR, "ERROR: Package info not found -- " + str(error)) @@ -661,7 +661,7 @@ try: FILE = open(Core.path + "/" + FILE_OPEN) - except Exception, error: + except Exception as error: # print "getHostInfo: Error opening file: %s" % error Core.updateStatus(Core.ERROR, "ERROR: Cannot open " + FILE_OPEN) @@ -951,7 +951,7 @@ for I in range(len(ONE_REPO)): ONE_REPO[I] = ONE_REPO[I].strip() #Converts ONE_REPO into a dictionary with the named keys - ONE_DICT = dict(zip(['Num', 'Alias', 'Name', 'Enabled', 'Refresh'], ONE_REPO)) + ONE_DICT = dict(list(zip(['Num', 'Alias', 'Name', 'Enabled', 'Refresh'], ONE_REPO))) REPOS.append(ONE_DICT) elif startRepos.search(content[line]): IN_REPOS = True @@ -1012,7 +1012,7 @@ for I in range(len(ONE_PRODUCT)): ONE_PRODUCT[I] = ONE_PRODUCT[I].strip() #Converts ONE_PRODUCT into a dictionary with the named keys - ONE_DICT = dict(zip(['Status', 'Respository', 'InternalName', 'Name', 'Version', 'Architecture', 'IsBase'], ONE_PRODUCT)) + ONE_DICT = dict(list(zip(['Status', 'Respository', 'InternalName', 'Name', 'Version', 'Architecture', 'IsBase'], ONE_PRODUCT))) PRODUCTS.append(ONE_DICT) elif startProducts.search(content[line]): IN_PRODUCTS = True @@ -1158,7 +1158,7 @@ for MOUNT in MOUNTS: #load each mount line output into the ENTRY list MOUNT = MOUNT.replace("(", '').replace(")", '') ENTRY = MOUNT.split() - if( len(ENTRY) <> 6 ): #ignore non-standard mount entries. They should only have six fields. + if( len(ENTRY) != 6 ): #ignore non-standard mount entries. They should only have six fields. ENTRY = [] continue # print "ENTRY mount", ENTRY @@ -1167,7 +1167,7 @@ MATCHED = False for FSENTRY in FSTAB: #check each FSENTRY to the current MOUNT THIS_ENTRY = FSENTRY.split() - if( len(THIS_ENTRY) <> 6 ): #consider non-standard entries as not MATCHED + if( len(THIS_ENTRY) != 6 ): #consider non-standard entries as not MATCHED break if( THIS_ENTRY[1] == ENTRY[2] ): #mount points match MATCHED = True @@ -1208,7 +1208,7 @@ SWAP = [] for FSENTRY in FSTAB: #check each FSENTRY for unmounted devices ENTRY = FSENTRY.split() - if( len(ENTRY) <> 6 ): #consider non-standard entries as not MATCHED + if( len(ENTRY) != 6 ): #consider non-standard entries as not MATCHED continue else: MISSING = True @@ -1312,13 +1312,13 @@ FIPS['Enabled'] = True GRUB2 = getGrub2Config() - if( 'GRUB_CMDLINE_LINUX_DEFAULT' in GRUB2.keys() ): + if( 'GRUB_CMDLINE_LINUX_DEFAULT' in list(GRUB2.keys()) ): if( "fips=1" in GRUB2['GRUB_CMDLINE_LINUX_DEFAULT'].lower() ): FIPS['GrubFips'] = True if( "boot=" in GRUB2['GRUB_CMDLINE_LINUX_DEFAULT'].lower() ): FIPS['GrubBoot'] = True - if( 'GRUB_CMDLINE_LINUX' in GRUB2.keys() ): + if( 'GRUB_CMDLINE_LINUX' in list(GRUB2.keys()) ): if( "fips=1" in GRUB2['GRUB_CMDLINE_LINUX'].lower() ): FIPS['GrubFips'] = True if( "boot=" in GRUB2['GRUB_CMDLINE_LINUX'].lower() ): @@ -1419,7 +1419,7 @@ TMP2 = VALUE.strip("[ ] ").split(",") for VALUE in TMP2: ARRAY_VALUES.append(VALUE.strip('" \' ')) - ARRAY_VALUES = filter(None, ARRAY_VALUES) + ARRAY_VALUES = [_f for _f in ARRAY_VALUES if _f] LVM_CONFIG[ARRAY_KEY.strip()] = sorted(ARRAY_VALUES) else: # print " Add to array:", TMP[0], "Length", len(THIS) @@ -1456,7 +1456,7 @@ if( PART.lower() == "all" ): LVM_CONFIG = LVM_CONFIG_ALL # print 'ALL:', LVM_CONFIG - elif PART in LVM_CONFIG_ALL.keys(): + elif PART in list(LVM_CONFIG_ALL.keys()): LVM_CONFIG = LVM_CONFIG_ALL[PART] # print PART + ":", LVM_CONFIG else: @@ -1568,7 +1568,7 @@ elif( LINE.strip().startswith("inet6 ") ): # inet6 fe80::5054:ff:fea4:12da/64 scope link NIC_LIST[DEV]['addr6'].append(LINE.split()[1]) - for DEV in NIC_LIST.keys(): + for DEV in list(NIC_LIST.keys()): ETHTOOL = [] NETCONFIG = [] if( Core.getRegExSection(NETWORK_FILE, "ethtool -k " + str(DEV), ETHTOOL) ):