[PATCH 3/3] Look for compressions other than .gz
We are getting rid of .gz Packages and Sources, which are
already gone from experimental, so these were broken there.
Signed-off-by: Emilio Pozuelo Monfort <pochu@debian.org>
---
dak/check_archive.py | 6 ++++--
dak/cruft_report.py | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dak/check_archive.py b/dak/check_archive.py
index 0d57970..24ccd76 100755
--- a/dak/check_archive.py
+++ b/dak/check_archive.py
@@ -381,7 +381,8 @@ def validate_sources(suite, component):
"""
Ensure files mentioned in Sources exist
"""
- filename = "%s/dists/%s/%s/source/Sources.gz" % (Cnf["Dir::Root"], suite, component)
+ filename = "%s/dists/%s/%s/source/Sources" % (Cnf["Dir::Root"], suite, component)
+ filename = utils.find_possibly_compressed_file(filename)
print "Processing %s..." % (filename)
Sources = apt_pkg.TagFile(filename)
while Sources.step():
@@ -413,8 +414,9 @@ def validate_packages(suite, component, architecture):
"""
Ensure files mentioned in Packages exist
"""
- filename = "%s/dists/%s/%s/binary-%s/Packages.gz" \
+ filename = "%s/dists/%s/%s/binary-%s/Packages" \
% (Cnf["Dir::Root"], suite, component, architecture)
+ filename = utils.find_possibly_compressed_file(filename)
print "Processing %s..." % (filename)
Packages = apt_pkg.TagFile(filename)
while Packages.step():
diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index 238409e..34bcdfe 100755
--- a/dak/cruft_report.py
+++ b/dak/cruft_report.py
@@ -578,7 +578,8 @@ def main ():
# Checks based on the Sources files
components = get_component_names(session)
for component in components:
- filename = "%s/dists/%s/%s/source/Sources.gz" % (suite.archive.path, suite_name, component)
+ filename = "%s/dists/%s/%s/source/Sources" % (suite.archive.path, suite_name, component)
+ filename = utils.find_possibly_compressed_file(filename)
Sources = apt_pkg.TagFile(filename)
while Sources.step():
source = Sources.section.find('Package')
@@ -622,7 +623,8 @@ def main ():
nfu_packages.setdefault(architecture,[])
nfu_entries = parse_nfu(architecture)
- filename = "%s/dists/%s/%s/binary-%s/Packages.gz" % (suite.archive.path, suite_name, component, architecture)
+ filename = "%s/dists/%s/%s/binary-%s/Packages" % (suite.archive.path, suite_name, component, architecture)
+ filename = utils.find_possibly_compressed_file(filename)
Packages = apt_pkg.TagFile(filename)
while Packages.step():
package = Packages.section.find('Package')
--
2.9.3
Reply to: