From 7806a709cd53c14d348b93e55e626e7fc29fc523 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Mon, 1 Jun 2015 21:36:36 +0200 Subject: Revert "reproducible: scheduler: use the gzip sources file instead of the xz one" using python 3.4 allows us to use the xz files This reverts commit e1ca3f62d40d557321cb8cfd28242b9203b91a2a. Conflicts: bin/reproducible_scheduler.py --- TODO | 1 - bin/reproducible_scheduler.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index 2958bbf7..28cea906 100644 --- a/TODO +++ b/TODO @@ -89,7 +89,6 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma * replace with bin/setsid.py workaround with setsid from the util-linux package from jessie * 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 851305f1..b7437328 100755 --- a/bin/reproducible_scheduler.py +++ b/bin/reproducible_scheduler.py @@ -11,7 +11,7 @@ # Schedule packages to be build. import sys -import gzip +import lzma import deb822 import aptsources.sourceslist import random @@ -47,9 +47,9 @@ def call_apt_update(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.gz' + remotefile = mirror + '/dists/' + suite + '/main/source/Sources.xz' log.info('Downloading sources file for ' + suite + ': ' + remotefile) - sources = gzip.decompress(urlopen(remotefile).read()).decode('utf8') + sources = lzma.decompress(urlopen(remotefile).read()).decode('utf8') log.debug('\tdownloaded') # extract relevant info (package name and version) from the sources file new_pkgs = [] -- cgit v1.2.3-54-g00ecf