mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-13 18:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

make sure all timestamps in index-v1 are utc

Browse source
This commit is contained in:
Michael Pöhn 2017-09-03 23:07:43 +02:00
parent 290b9050e0
commit 26192a00e2
2 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fdroidserver/index.py
View file

@ -30,6 +30,7 @@ import shutil
import tempfile
import urllib.parse
import zipfile
import calendar
from binascii import hexlify, unhexlify
from datetime import datetime
from xml.dom.minidom import Document
@ -165,7 +166,9 @@ def make_v1(apps, packages, repodir, repodict, requestsdict, fdroid_signing_key_
if isinstance(obj, set):
return sorted(list(obj))
if isinstance(obj, datetime):
return int(obj.timestamp() * 1000) # Java expects milliseconds
# Java prefers milliseconds
# we also need to accound for time zone/daylight saving time
return int(calendar.timegm(obj.timetuple()) * 1000)
raise TypeError(repr(obj) + " is not JSON serializable")
output = collections.OrderedDict()