diff options
| author | Alan Viverette <alanv@google.com> | 2017-08-09 17:45:00 -0400 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2017-08-10 11:21:00 -0400 |
| commit | 44ad4e4376b6443eca0c9cde53e96966ee06c9a4 (patch) | |
| tree | 2dcd76a4e6373d9512a2402813c75bc4392bedf3 | |
| parent | 88e216662c2e58edfaaade0d56ab8e2fe71a48a4 (diff) | |
| download | sdk-44ad4e4376b6443eca0c9cde53e96966ee06c9a4.tar.gz | |
Blacklist noto-emoji-compat-java and update artifact pattern for timestamp
Change-Id: I0769b7874c09ff87cff23afe5f7c8e407d8d2a80
Fixes: 64524222
Test: ./update_current.py 4257112 -s
| -rwxr-xr-x | update_current.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/update_current.py b/update_current.py index f9c69051a..04154db64 100755 --- a/update_current.py +++ b/update_current.py @@ -58,10 +58,11 @@ blacklist_files = [ 'annotations.zip', 'public.txt', 'R.txt', - 'AndroidManifest.xml' + 'AndroidManifest.xml', + 'noto-emoji-compat-java.jar' ] -artifact_pattern = re.compile(r"^(.+?)-(\d+\.\d+\.\d+(?:-\w+\d+)?)\.(jar|aar)$") +artifact_pattern = re.compile(r"^(.+?)-(\d+\.\d+\.\d+(?:-\w+\d+)?(?:-[\d.]+)*)\.(jar|aar)$") def touch(fname, times=None): @@ -259,9 +260,9 @@ except subprocess.CalledProcessError: try: has_args = args.support or args.platform - if has_args and args.support: + if (has_args and args.support) or not has_args: update_support('support_library', args.buildId) - if has_args and args.platform: + if (has_args and args.platform) or not has_args: update_sdk_repo('sdk_phone_armv7-sdk_mac', args.buildId) update_system('sdk_phone_armv7-sdk_mac', args.buildId) @@ -281,4 +282,4 @@ finally: ['git', 'commit', '-m', 'COMMIT TO REVERT - RESET ME!!!'], stdout=bitbucket) subprocess.check_call(['git', 'reset', '--hard', 'HEAD~1'], stdout=bitbucket) except subprocess.CalledProcessError: - print >> sys.stderr, "ERROR: Failed cleaning up, manual cleanup required!!!"
\ No newline at end of file + print >> sys.stderr, "ERROR: Failed cleaning up, manual cleanup required!!!" |