external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

git-interface: Do not use UNIX_TIMESTAMP

Browse source 
Avoid using UNIX_TIMESTAMP which is not part of the SQL standard.
Retrieve the current UNIX time in Python and substitute it into the SQL
queries instead.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
This commit is contained in:
Lukas Fleischer 2016-08-05 11:36:19 +02:00
parent 27631f1157
commit f2a6bd207d
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
git-interface/git-serve.py
View file

@ -4,6 +4,7 @@ import os
import re import re
import shlex import shlex
import sys import sys
import time
import config import config
import db import db
@ -58,10 +59,10 @@ def create_pkgbase(pkgbase, user):
if userid == 0: if userid == 0:
die('{:s}: unknown user: {:s}'.format(action, user)) die('{:s}: unknown user: {:s}'.format(action, user))
now = int(time.time())
cur = conn.execute("INSERT INTO PackageBases (Name, SubmittedTS, " + cur = conn.execute("INSERT INTO PackageBases (Name, SubmittedTS, " +
"ModifiedTS, SubmitterUID, MaintainerUID) VALUES " + "ModifiedTS, SubmitterUID, MaintainerUID) VALUES " +
"(?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), ?, ?)", "(?, ?, ?, ?, ?)", [pkgbase, now, now, userid, userid])
[pkgbase, userid, userid])
pkgbase_id = cur.lastrowid pkgbase_id = cur.lastrowid
cur = conn.execute("INSERT INTO PackageNotifications " + cur = conn.execute("INSERT INTO PackageNotifications " +

6
git-interface/git-update.py
View file

@ -5,6 +5,7 @@ import pygit2
import re import re
import subprocess import subprocess
import sys import sys
import time
import srcinfo.parse import srcinfo.parse
import srcinfo.utils import srcinfo.utils
@ -70,9 +71,10 @@ def save_metadata(metadata, conn, user):
user_id = int(cur.fetchone()[0]) user_id = int(cur.fetchone()[0])
# Update package base details and delete current packages. # Update package base details and delete current packages.
conn.execute("UPDATE PackageBases SET ModifiedTS = UNIX_TIMESTAMP(), " + now = int(time.time())
conn.execute("UPDATE PackageBases SET ModifiedTS = ?, " +
"PackagerUID = ?, OutOfDateTS = NULL WHERE ID = ?", "PackagerUID = ?, OutOfDateTS = NULL WHERE ID = ?",
[user_id, pkgbase_id]) [now, user_id, pkgbase_id])
conn.execute("UPDATE PackageBases SET MaintainerUID = ? " + conn.execute("UPDATE PackageBases SET MaintainerUID = ? " +
"WHERE ID = ? AND MaintainerUID IS NULL", "WHERE ID = ? AND MaintainerUID IS NULL",
[user_id, pkgbase_id]) [user_id, pkgbase_id])