Merge remote-tracking branch 'dktrkranz/fixes'

[dak.git] / dak / check_archive.py

diff --git a/dak/check_archive.py b/dak/check_archive.py
index d0c71d478c2d3a941670749086e8c6e66bafaf4f..926b4fb5009cf18a36ea34c8bb4f4165a7a58731 100755 (executable)
--- a/dak/check_archive.py
+++ b/dak/check_archive.py
@@ -274,7 +274,7 @@ def check_checksums():
 
     print "Checking file checksums & sizes..."
     for f in q:
-        filename = os.path.abspath(os.path.join(f.location.path, f.filename))
+        filename = f.fullpath
 
         try:
             fi = utils.open_file(filename)
@@ -391,10 +391,10 @@ def validate_sources(suite, component):
         sys.exit(result)
     sources = utils.open_file(temp_filename)
     Sources = apt_pkg.TagFile(sources)
-    while Sources.Step():
-        source = Sources.Section.Find('Package')
-        directory = Sources.Section.Find('Directory')
-        files = Sources.Section.Find('Files')
+    while Sources.step():
+        source = Sources.section.find('Package')
+        directory = Sources.section.find('Directory')
+        files = Sources.section.find('Files')
         for i in files.split('\n'):
             (md5, size, name) = i.split()
             filename = "%s/%s/%s" % (Cnf["Dir::Root"], directory, name)
@@ -433,8 +433,8 @@ def validate_packages(suite, component, architecture):
         sys.exit(result)
     packages = utils.open_file(temp_filename)
     Packages = apt_pkg.TagFile(packages)
-    while Packages.Step():
-        filename = "%s/%s" % (Cnf["Dir::Root"], Packages.Section.Find('Filename'))
+    while Packages.step():
+        filename = "%s/%s" % (Cnf["Dir::Root"], Packages.section.find('Filename'))
         if not os.path.exists(filename):
             print "W: %s missing." % (filename)
     packages.close()