util/timeutil: fix get tz at mojave #7784
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zhexuany
changed the title
|
Does it affect macOS High Sierra after this pr merge? |
|
Nope. Since it falls back to using |
|
LGTM |
|
/run-all-tests |
|
/run-common-test |
zhexuany
added
status/LGT2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
After upgrading to macOs Mojave, soft link of
/etc/localtimehad been changed from/var/db/timezone/tz/2018e.1.0/zoneinfo/Asia/Shanghaito/usr/share/zoneinfo.default/Asia/Shanghai. A test case failed and this PR addresses this.What is changed and how it works?
inferTZNameFromFileNameis usingzoneinfoto locate the IANA timezone name. This PR addresses that issue by adding one more logic, which is usingzoneinfo.defaultto locate the IANA timezone name first. If nothing can be got, then fall back to usingzoneinfo.Check List
Tests
Code changes
Side effects
Related changes