Skip to content

Commit be2bd22

Browse files
committed
Try the packages in reverse order
Handles the difference between ninja-fortran (version something) and ninja (version fortran-something).
1 parent 2e92a39 commit be2bd22

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

publish/aliPublishS3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,11 +545,11 @@ class RPM(object):
545545
return True
546546

547547
def nameVerFromTar(tar, arch, validPacks):
548-
for pkgName in validPacks:
548+
for pkgName in sorted(validPacks, key=len, reverse=True):
549549
vre = format(r"^(%(pack)s)-(.*?)(\.%(arch)s\.tar\.gz)?$", pack=escape(pkgName), arch=arch)
550550
vm = search(vre, tar)
551551
if vm:
552-
return { "name": vm.group(1), "ver": vm.group(2) }
552+
return {"name": vm.group(1), "ver": vm.group(2)}
553553
return None
554554

555555
def prettyPrintPkg(pkg):

0 commit comments

Comments
 (0)