Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Revert "Hack around c8s python39 module versions not in ascending order"

Browse source 
EPEL 8 Next is EOL.

This reverts commit fc460139cd.
This commit is contained in:
Miro Hrončok 2024-07-24 10:16:03 +02:00 • committed by zlopez
parent 6bf5964ef2
commit fbf810dfaa
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
roles/grobisplitter/files/splitter.py
View file

@ -192,7 +192,7 @@ def validate_filenames(directory, repoinfo):
return isok return isok
def get_default_modules(directory, *, hack_python39=False): def get_default_modules(directory):
""" """
Work through the list of modules and come up with a default set of Work through the list of modules and come up with a default set of
modules which would be the minimum to output. modules which would be the minimum to output.
@ -275,15 +275,14 @@ def get_default_modules(directory, *, hack_python39=False):
if tmp_name in tempdict: if tmp_name in tempdict:
# print("We found %s" % tmp_name) # print("We found %s" % tmp_name)
# Get the stream version we are looking at # Get the stream version we are looking at
n1,_,ts1,*_=ourname.split(":") ts1=ourname.split(":")[2]
# Get the stream version we stored away # Get the stream version we stored away
ts2=tempdict[tmp_name].split(":")[2] ts2=tempdict[tmp_name].split(":")[2]
# See if we got a newer one. We probably # See if we got a newer one. We probably
# don't as it is a sorted list but we # don't as it is a sorted list but we
# could have multiple contexts which would # could have multiple contexts which would
# change things. # change things.
if ( int(ts1) > int(ts2) or if ( int(ts1) > int(ts2) ):
(hack_python39 and n1 == "python39" and len(str(ts1)) < len(str(ts2))) ):
# print ("%s > %s newer for %s", ts1,ts2,ourname) # print ("%s > %s newer for %s", ts1,ts2,ourname)
tempdict[tmp_name] = ourname tempdict[tmp_name] = ourname
else: else:
@ -345,8 +344,6 @@ def parse_args():
action='store_true', default=False) action='store_true', default=False)
parser.add_argument('--only-defaults', help='Only output default modules', parser.add_argument('--only-defaults', help='Only output default modules',
action='store_true', default=False) action='store_true', default=False)
parser.add_argument('--hack-python39', help='Hack around https://pagure.io/releng/issue/11947',
action='store_true', default=False)
return parser.parse_args() return parser.parse_args()
@ -410,8 +407,7 @@ def main():
repos = parse_repository(args.repository) repos = parse_repository(args.repository)
if args.only_defaults: if args.only_defaults:
def_modules = get_default_modules(args.repository, def_modules = get_default_modules(args.repository)
hack_python39=args.hack_python39)
else: else:
def_modules = set() def_modules = set()