1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-06-19 23:05:58 +01:00

APKResolution: Uses loose version matching

Allows for more flexible version matching  e.g. specifying a
version of 4, 4.3, 4.3.1 will all resolve to an apk version of 4.3.1
This commit is contained in:
Marc Bonnici
2017-07-18 16:27:57 +01:00
parent c722a6a73c
commit f8e4d34e60
2 changed files with 23 additions and 3 deletions

@ -279,7 +279,19 @@ def apk_version_matches(path, version):
info = ApkInfo(path)
if info.version_name == version or info.version_code == version:
return True
return False
return loose_version_matching(version, info.version_name)
def loose_version_matching(config_version, apk_version):
config_version = config_version.split('.')
apk_version = apk_version.split('.')
if len(apk_version) < len(config_version):
return False # More specific version requested than available
for i in xrange(len(config_version)):
if config_version[i] != apk_version[i]:
return False
return True
def file_name_matches(path, pattern):