summaryrefslogtreecommitdiffstats
path: root/bin/reproducible_html_packages.py
diff options
context:
space:
mode:
authorValerie R Young <spectranaut@riseup.net>2016-09-09 15:12:15 -0400
committerHolger Levsen <holger@layer-acht.org>2016-10-17 11:22:18 +0200
commit078490603dea0a356c79fd448c5d5a861b218992 (patch)
treed2388a3c205a45f0de9cbaf57bb1d5ce4ce923f2 /bin/reproducible_html_packages.py
parenta363474122e9a7b59c099bca13e0f5c5845a87c4 (diff)
downloadjenkins.debian.net-078490603dea0a356c79fd448c5d5a861b218992.tar.xz
reproducible debian: make python sql more sqlite/postgres agnostic
This commit fixes all the python script sql queries that required minimal editing to be syntactically correct for both sqlite and postgres. Almost all fixes consist of the removal of double quotes from query strings. NOTE: the following scripts expect the schedule table's primary key to autoincrement. Running reproducible_db_maintence.py on a postgres database will not add the necessary autoincrementing functionality at this time. The following script WILL run on the sqlite database but will fail on postgres database constructed from reproducible_db_maintence.py until this is fixed: reproducible_remote_scheduler.py reproducible_schedule.py Signed-off-by: Mattia Rizzolo <mattia@debian.org> Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin/reproducible_html_packages.py')
-rwxr-xr-xbin/reproducible_html_packages.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py
index 250cec0c..2c2a742f 100755
--- a/bin/reproducible_html_packages.py
+++ b/bin/reproducible_html_packages.py
@@ -450,10 +450,10 @@ def purge_old_pages():
if page == 'diffoscope-results':
continue
pkg = page.rsplit('.', 1)[0]
- query = 'SELECT s.name ' + \
- 'FROM sources AS s ' + \
- 'WHERE s.name="{name}" ' + \
- 'AND s.suite="{suite}" AND s.architecture="{arch}"'
+ query = "SELECT s.name " + \
+ "FROM sources AS s " + \
+ "WHERE s.name='{name}' " + \
+ "AND s.suite='{suite}' AND s.architecture='{arch}'"
query = query.format(name=pkg, suite=suite, arch=arch)
result = query_db(query)
if not result: # actually, the query produces no results
@@ -476,10 +476,10 @@ def purge_old_pages():
log.debug('diffoscope page presents: ' + str(presents))
for page in presents:
pkg = page.rsplit('.', 1)[0]
- query = 'SELECT s.name ' + \
- 'FROM sources AS s ' + \
- 'WHERE s.name="{name}" ' + \
- 'AND s.suite="{suite}" AND s.architecture="{arch}"'
+ query = "SELECT s.name " + \
+ "FROM sources AS s " + \
+ "WHERE s.name='{name}' " + \
+ "AND s.suite='{suite}' AND s.architecture='{arch}'"
query = query.format(name=pkg, suite=suite, arch=arch)
result = query_db(query)
if not result: # actually, the query produces no results