summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-02-26 18:27:01 +0100
committerHolger Levsen <holger@layer-acht.org>2015-02-26 18:29:37 +0100
commite1ca3f62d40d557321cb8cfd28242b9203b91a2a (patch)
tree646ba32d13b0ae2ef4b3117a80f147893fba105a
parent3100716432fe46d8aa1c37798c9b1700934f6e69 (diff)
downloadjenkins.debian.net-e1ca3f62d40d557321cb8cfd28242b9203b91a2a.tar.xz
reproducible: scheduler: use the gzip sources file instead of the xz one
-rw-r--r--TODO1
-rwxr-xr-xbin/reproducible_scheduler.py6
2 files changed, 4 insertions, 3 deletions
diff --git a/TODO b/TODO
index 2196fb2a..063f870e 100644
--- a/TODO
+++ b/TODO
@@ -41,6 +41,7 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
* etc/pbuilderrc: remove /run/shm bindmount once we are running jessie - this is a workaround for #700591
* bin/g-i-installation: use lvcreate without --virtualsize
* check if the sudo workaround in bin/g-i-installation is still needed: 'guestmount -o uid=$(id -u) -o gid=$(id -g)' would be nicer, but it doesnt work: as root, the files seem to belong to jenkins, but as jenkins they cannot be accessed.
+* reproducible: let the scheduler use the xz-compressed file instead of the gzip one. This is because of missing lzma module in wheezy's python.
=== To be done once bugs are fixed
diff --git a/bin/reproducible_scheduler.py b/bin/reproducible_scheduler.py
index c4071b76..ccc58974 100755
--- a/bin/reproducible_scheduler.py
+++ b/bin/reproducible_scheduler.py
@@ -10,7 +10,7 @@
# Schedule packages to be build.
import sys
-import lzma
+import gzip
import deb822
import aptsources.sourceslist
from time import sleep
@@ -54,9 +54,9 @@ def check_suite_avail(suite):
def update_sources_tables(suite):
# download the sources file for this suite
mirror = 'http://ftp.de.debian.org/debian'
- remotefile = mirror + '/dists/' + suite + '/main/source/Sources.xz'
+ remotefile = mirror + '/dists/' + suite + '/main/source/Sources.gz'
log.info('Downloading sources file for ' + suite + ': ' + remotefile)
- sources = lzma.decompress(urlopen(remotefile).read()).decode()
+ sources = gzip.decompress(urlopen(remotefile).read()).decode()
log.debug('\tdownloaded')
# extract relevant info (package name and version) from the sources file
new_pkgs = []