From: Daniel Martí Date: Wed, 13 Jul 2016 15:32:34 +0000 (+0000) Subject: Merge branch 'precommit-fixes' into 'master' X-Git-Tag: 0.7.0~32 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0f708f367cb2d7aadfb513fe5af3f3c8571ef389;hp=b53e56916c23133788216589e47ddb1aac899a86;p=fdroidserver.git Merge branch 'precommit-fixes' into 'master' pre-commit script fixes See merge request !145 --- diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 2c2bb4e0..ce81b385 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1570,9 +1570,11 @@ class KnownApks: # Record an apk (if it's new, otherwise does nothing) # Returns the date it was added. - def recordapk(self, apk, app): + def recordapk(self, apk, app, default_date=None): if apk not in self.apks: - self.apks[apk] = (app, time.gmtime(time.time())) + if default_date is None: + default_date = time.gmtime(time.time()) + self.apks[apk] = (app, default_date) self.changed = True _, added = self.apks[apk] return added diff --git a/fdroidserver/update.py b/fdroidserver/update.py index dba1a409..e4d2ff3c 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -784,13 +784,14 @@ def scan_apks(apps, apkcache, repodir, knownapks, use_date_from_apk=False): shutil.copyfile(baseline, os.path.join(get_icon_dir(repodir, '0'), iconfilename)) + if use_date_from_apk and manifest.date_time[1] != 0: + default_date_param = datetime(*manifest.date_time).utctimetuple() + else: + default_date_param = None + # Record in known apks, getting the added date at the same time.. - added = knownapks.recordapk(apk['apkname'], apk['id']) + added = knownapks.recordapk(apk['apkname'], apk['id'], default_date=default_date_param) if added: - if use_date_from_apk and manifest.date_time[1] != 0: - added = datetime(*manifest.date_time).timetuple() - logging.debug("Using date from APK") - apk['added'] = added apkcache[apkfilename] = apk