From fbf810dfaaf048740416f7c96276756c203dae06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 24 Jul 2024 10:16:03 +0200 Subject: [PATCH] Revert "Hack around c8s python39 module versions not in ascending order" EPEL 8 Next is EOL. This reverts commit fc460139cdad3c9a73a263ff33f8ae1f03ed8135. --- roles/grobisplitter/files/splitter.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/roles/grobisplitter/files/splitter.py b/roles/grobisplitter/files/splitter.py index 28f2532e94..9b40d0e5d2 100755 --- a/roles/grobisplitter/files/splitter.py +++ b/roles/grobisplitter/files/splitter.py @@ -192,7 +192,7 @@ def validate_filenames(directory, repoinfo): 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 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: # print("We found %s" % tmp_name) # Get the stream version we are looking at - n1,_,ts1,*_=ourname.split(":") + ts1=ourname.split(":")[2] # Get the stream version we stored away ts2=tempdict[tmp_name].split(":")[2] # See if we got a newer one. We probably # don't as it is a sorted list but we # could have multiple contexts which would # change things. - if ( int(ts1) > int(ts2) or - (hack_python39 and n1 == "python39" and len(str(ts1)) < len(str(ts2))) ): + if ( int(ts1) > int(ts2) ): # print ("%s > %s newer for %s", ts1,ts2,ourname) tempdict[tmp_name] = ourname else: @@ -345,8 +344,6 @@ def parse_args(): action='store_true', default=False) parser.add_argument('--only-defaults', help='Only output default modules', 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() @@ -410,8 +407,7 @@ def main(): repos = parse_repository(args.repository) if args.only_defaults: - def_modules = get_default_modules(args.repository, - hack_python39=args.hack_python39) + def_modules = get_default_modules(args.repository) else: def_modules = set()