X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdatabase.py;h=606e8f2de8ba76afbe38528ac77610684252dfe6;hb=3b7335ec8615387761937d34423581df226c22dc;hp=784b499cd59155fdfe2b2f9ca9ad948d6a6e05af;hpb=aa1ca85fe35172277b7ea6173cf143009cad8aac;p=dak.git diff --git a/daklib/database.py b/daklib/database.py index 784b499c..606e8f2d 100755 --- a/daklib/database.py +++ b/daklib/database.py @@ -33,6 +33,7 @@ import sys import time import types import utils +from binary import Binary ################################################################################ @@ -810,7 +811,7 @@ def get_suites(pkgname, src=False): ################################################################################ -def copy_temporary_contents(package, version, deb): +def copy_temporary_contents(package, version, deb, reject): """ copy the previously stored contents from the temp table to the permanant one @@ -833,10 +834,10 @@ def copy_temporary_contents(package, version, deb): "__TO_ADDRESS__": Cnf["Dinstall::MyAdminAddress"], "__DAK_ADDRESS__": Cnf["Dinstall::MyEmailAddress"] } - message = utils.TemplateSubst(Subst, Cnf["Dir::Templates"]+"/missing-contents") + message = utils.TemplateSubst(subst, Cnf["Dir::Templates"]+"/missing-contents") utils.send_mail( message ) - exists = DBConn().insert_content_path(package, version, deb) + exists = Binary(deb, reject).scan_package() if exists: sql = """INSERT INTO content_associations(binary_pkg,filepath,filename)