Snap for 5348557 from 1dc2143b13455b4ab0e2a0aa59dda791c0b0084f to qt-releaseandroid-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r1android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid10-gsi

Change-Id: Ide696752dd1cf90929f4d36f4d6a33c2e452634b

1 files changed, 4 insertions, 3 deletions

diff --git a/updater_utils.py b/updater_utils.py
index 54ddf98..a08846c 100644
--- a/updater_utils.py
+++ b/updater_utils.py
@@ -57,11 +57,12 @@ def replace_package(source_dir, target_dir):
         'update_package.sh')
     subprocess.check_call(['bash', script_path, source_dir, target_dir])
 
-
+VERSION_SPLITTER_PATTERN = r'[\.\-_]'
 VERSION_PATTERN = (r'^(?P<prefix>[^\d]*)' +
-                   r'(?P<version>\d+(\.\d+)*)' +
+                   r'(?P<version>\d+(' + VERSION_SPLITTER_PATTERN + r'\d+)*)' +
                    r'(?P<suffix>.*)$')
 VERSION_RE = re.compile(VERSION_PATTERN)
+VERSION_SPLITTER_RE = re.compile(VERSION_SPLITTER_PATTERN)
 
 
 def _parse_version(version):
@@ -82,7 +83,7 @@ def _match_and_get_version(prefix, suffix, version):
 
     right_format = (version_prefix == prefix and version_suffix == suffix)
 
-    return [right_format] + [int(v) for v in version.split('.')]
+    return [right_format] + [int(v) for v in VERSION_SPLITTER_RE.split(version)]
 
 
 def get_latest_version(current_version, version_list):