X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcheck_archive.py;h=26a85cb5b42003ef68cfd84a5cd9b072b2ba302c;hb=ba77095c326cc03fc5ab18423b874ff06e6fcdba;hp=896ab1f546d0134eedeae6ce08501c60d3f3e877;hpb=56628c4a6e7a7ee774aac44b123090447c62d2af;p=dak.git diff --git a/dak/check_archive.py b/dak/check_archive.py index 896ab1f5..26a85cb5 100755 --- a/dak/check_archive.py +++ b/dak/check_archive.py @@ -30,6 +30,7 @@ import commands, os, pg, stat, sys, time import apt_pkg, apt_inst from daklib import database from daklib import utils +from daklib.regexes import re_issource ################################################################################ @@ -287,7 +288,7 @@ def check_missing_tar_gz_in_dsc(): dsc_files = utils.build_file_list(dsc, is_a_dsc=1) has_tar = 0 for f in dsc_files.keys(): - m = utils.re_issource.match(f) + m = re_issource.match(f) if not m: utils.fubar("%s not recognised as source." % (f)) ftype = m.group(3) @@ -307,7 +308,7 @@ def validate_sources(suite, component): filename = "%s/dists/%s/%s/source/Sources.gz" % (Cnf["Dir::Root"], suite, component) print "Processing %s..." % (filename) # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance... - temp_filename = utils.temp_filename() + (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)) @@ -346,7 +347,7 @@ def validate_packages(suite, component, architecture): % (Cnf["Dir::Root"], suite, component, architecture) print "Processing %s..." % (filename) # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance... - temp_filename = utils.temp_filename() + (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))