X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Frm.py;h=fe763605f545ddff7748a2a7dad6d7071ebc44ab;hb=3a044cf559c390a0a4dc0658ec565b6a327f136a;hp=8dff809ef30c5289368e22870ec831212803bae1;hpb=2d4f734d1d24765254687338a386be1e742f713b;p=dak.git diff --git a/dak/rm.py b/dak/rm.py index 8dff809e..fe763605 100755 --- a/dak/rm.py +++ b/dak/rm.py @@ -41,9 +41,7 @@ import commands import os -import re import sys -import gzip import apt_pkg import apt_inst @@ -116,7 +114,11 @@ def reverse_depends_check(removals, suites, arches=None): for component in components: filename = "%s/dists/%s/%s/binary-%s/Packages.gz" % (cnf["Dir::Root"], suites[0], component, architecture) # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance... - packages = gzip.open(filename, 'rb') + (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) + packages = utils.open_file(temp_filename) Packages = apt_pkg.ParseTagFile(packages) while Packages.Step(): package = Packages.Section.Find("Package") @@ -146,6 +148,7 @@ def reverse_depends_check(removals, suites, arches=None): virtual_packages[virtual_pkg] += 1 p2c[package] = component packages.close() + os.unlink(temp_filename) # If a virtual package is only provided by the to-be-removed # packages, treat the virtual package as to-be-removed too. @@ -196,7 +199,12 @@ def reverse_depends_check(removals, suites, arches=None): for component in components: filename = "%s/dists/%s/%s/source/Sources.gz" % (cnf["Dir::Root"], suites[0], component) # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance... - sources = gzip.open(filename, 'rb') + (fd, temp_filename) = utils.temp_filename() + result, output = commands.getstatusoutput("gunzip -c %s > %s" % (filename, temp_filename)) + if result != 0: + sys.stderr.write("Gunzip invocation failed!\n%s\n" % (output)) + sys.exit(result) + sources = utils.open_file(temp_filename, "r") Sources = apt_pkg.ParseTagFile(sources) while Sources.Step(): source = Sources.Section.Find("Package")