Move common code to the new get_packages_from_ftp()

[dak.git] / dak / override_disparity.py

diff --git a/dak/override_disparity.py b/dak/override_disparity.py
index 7a3b290656d1202edfd94db62857b2776fd6e7aa..94e1e9e8b0222863fe0db36d6f6436eff2931b75 100755 (executable)
--- 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():