X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Foverride_disparity.py;h=94e1e9e8b0222863fe0db36d6f6436eff2931b75;hb=26fd1f178ce88c250744d85d6bc15765d9ccf203;hp=7a3b290656d1202edfd94db62857b2776fd6e7aa;hpb=a6b3f550d4281fcd392ee027e9ee330b850dbcc3;p=dak.git diff --git a/dak/override_disparity.py b/dak/override_disparity.py index 7a3b2906..94e1e9e8 100755 --- a/dak/override_disparity.py +++ b/dak/override_disparity.py @@ -37,7 +37,6 @@ Generate a list of override disparities import os import sys import apt_pkg -import commands from daklib.config import Config from daklib.dbconn import * @@ -85,16 +84,7 @@ def main(): arches -= set(['source', 'all']) for arch in arches: for component in components: - filename = '%s/dists/%s/%s/binary-%s/Packages.gz' % (cnf['Dir::Root'], suite, component, arch) - (fd, temp_filename) = utils.temp_filename() - (result, output) = commands.getstatusoutput('gunzip -c %s > %s' % (filename, temp_filename)) - if (result != 0): - utils.fubar('Gunzip invocation failed!\n%s\n' % (output), result) - filename = '%s/dists/%s/%s/debian-installer/binary-%s/Packages.gz' % (cnf['Dir::Root'], suite, component, arch) - if os.path.exists(filename): - (result, output) = commands.getstatusoutput('gunzip -c %s >> %s' % (filename, temp_filename)) - if (result != 0): - utils.fubar('Gunzip invocation failed!\n%s\n' % (output), result) + temp_filename = utils.get_packages_from_ftp(cnf['Dir::Root'], suite, component, arch) packages_file = utils.open_file(temp_filename) Packages = apt_pkg.ParseTagFile(packages_file) while Packages.Step():