diff options
| author | Elliott Hughes <enh@google.com> | 2012-10-25 15:09:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-25 15:09:29 -0700 |
| commit | 85819efe8f771759d12ab86f0bd47ede621dbb7d (patch) | |
| tree | b2f39bf6014bbe47db864114cc670981f0dfca98 /libc/tzcode | |
| parent | df7f24f310ee3ceb1dc9413d59d5a8816eb584ef (diff) | |
| parent | f2b3ac9502e08ef53d4eedd7e93ea9a00d185055 (diff) | |
| download | bionic-85819efe8f771759d12ab86f0bd47ede621dbb7d.zip bionic-85819efe8f771759d12ab86f0bd47ede621dbb7d.tar.gz bionic-85819efe8f771759d12ab86f0bd47ede621dbb7d.tar.bz2 | |
am f2b3ac95: Merge "Fix recovery: don\'t assert if there\'s no tzdata."
* commit 'f2b3ac9502e08ef53d4eedd7e93ea9a00d185055':
Fix recovery: don't assert if there's no tzdata.
Diffstat (limited to 'libc/tzcode')
| -rw-r--r-- | libc/tzcode/localtime.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libc/tzcode/localtime.c b/libc/tzcode/localtime.c index fcaf48b..6ed36c8 100644 --- a/libc/tzcode/localtime.c +++ b/libc/tzcode/localtime.c @@ -2271,7 +2271,9 @@ static int __bionic_open_tzdata(const char* olson_id, int* data_size) { if (fd < 0) { fd = __bionic_open_tzdata_path("/system/usr/share/zoneinfo/tzdata", olson_id, data_size); if (fd == -2) { - __assert2(__FILE__, __LINE__, __func__, "couldn't find any tzdata!"); + // The first thing that 'recovery' does is try to format the current time. It doesn't have + // any tzdata available, so we must not abort here --- doing so breaks the recovery image! + fprintf(stderr, "%s: couldn't find any tzdata when looking for %s!\n", __FUNCTION__, olson_id); } } return fd; |