diff options
| author | Haibo Huang <hhb@google.com> | 2019-02-28 17:13:50 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-28 17:13:50 -0800 |
| commit | 1dc2143b13455b4ab0e2a0aa59dda791c0b0084f (patch) | |
| tree | 3d542e4d228c55df36d3fc438aa374b256d5e615 | |
| parent | 9659052609714c9af4a097897077ed3ef78ef05a (diff) | |
| parent | 13c4983cc991f8c14da20843eb7fdf47869631aa (diff) | |
| download | external_updater-android10-qpr2-s3-release.tar.gz | |
Support version splitter other than dot am: f160266699 am: 2c8e18ece7android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
am: 13c4983cc9
Change-Id: I3f49f33648ab8db3d36a824bfce09ff3d05f4137
| -rw-r--r-- | updater_utils.py | 7 |
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): |