From: Chris Lamb <lamby@debian.org>
Date: Mon, 26 Oct 2009 14:54:42 +0000 (+0000)
Subject: Revert "Use gzip.open(.., 'rb')" as this version of python-apt is olde
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7a24a0f5ef24832beaaf2ca8f12ea2536b66e92;p=dak

Revert "Use gzip.open(.., 'rb')" as this version of python-apt is olde

This reverts commit 91cd6acebec69854074c594bf917561001f57ef4.

Signed-off-by: Chris Lamb <lamby@debian.org>
---

diff --git a/dak/rm.py b/dak/rm.py
index 8dff809e..8ed03412 100755
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -43,7 +43,6 @@ import commands
 import os
 import re
 import sys
-import gzip
 import apt_pkg
 import apt_inst
 
@@ -116,7 +115,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 +149,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 +200,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")