convert apk timestamp from filesystem to utc before storing

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index ed4e551ed88776cfefdb03688d5fef9de2b90b84..8b35d49e1d70e85e292c0c447c030799c757c9b3 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1686,7 +1686,6 @@ class KnownApks:
         if apkName not in self.apks:
             if default_date is None:
                 default_date = datetime.utcnow()
-            default_date = datetime(default_date.year, default_date.month, default_date.day, 0, 0, 0, 0)
             self.apks[apkName] = (app, default_date)
             self.changed = True
         _, added = self.apks[apkName]

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index c5fb4fd3957a1338b6a7abbff109549e7a2b7e85..883526c11a8ea5c8d3646fe1288fd0e379f76ed7 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -28,6 +28,7 @@ import socket
 import zipfile
 import hashlib
 import pickle
+import time
 from datetime import datetime, timedelta
 from argparse import ArgumentParser
 
@@ -930,7 +931,7 @@ def scan_repo_files(apkcache, repodir, knownapks, use_date_from_file=False):
 
         if use_date_from_file:
             timestamp = stat.st_ctime
-            default_date_param = datetime.fromtimestamp(timestamp).utctimetuple()
+            default_date_param = time.gmtime(time.mktime(datetime.fromtimestamp(timestamp).timetuple()))
         else:
             default_date_param = None