summaryrefslogtreecommitdiffstats
path: root/libc/tools/zoneinfo/generate
diff options
context:
space:
mode:
Diffstat (limited to 'libc/tools/zoneinfo/generate')
-rwxr-xr-xlibc/tools/zoneinfo/generate5
1 files changed, 3 insertions, 2 deletions
diff --git a/libc/tools/zoneinfo/generate b/libc/tools/zoneinfo/generate
index ab2617f..7017e90 100755
--- a/libc/tools/zoneinfo/generate
+++ b/libc/tools/zoneinfo/generate
@@ -92,7 +92,7 @@ def upgrade_to(ftp, filename):
subprocess.check_call(['javac', '-d', '.',
'%s/ZoneCompactor.java' % bionic_libc_tools_zoneinfo_dir,
'%s/ZoneInfo.java' % bionic_libc_tools_zoneinfo_dir])
- subprocess.check_call(['java', 'ZoneCompactor', 'setup', 'data'])
+ subprocess.check_call(['java', '-classpath', '.', 'ZoneCompactor', 'setup', 'data'])
print 'Updating bionic from %s to %s...' % (current_tzdata_version(), version)
# Move the .dat and .idx files...
@@ -116,7 +116,8 @@ ftp.cwd('tz/releases')
tzdata_filenames = []
for filename in ftp.nlst():
if filename.startswith('tzdata20'):
- tzdata_filenames.append(filename)
+ if filename.endswith('tar.gz'):
+ tzdata_filenames.append(filename)
tzdata_filenames.sort()
# If you're several releases behind, we'll walk you through the upgrades one by one.