-def insert_content_path(bin_id, fullpath):
- global insert_contents_file_cache
- cache_key = "%s_%s" % (bin_id, fullpath)
-
- # have we seen this contents before?
- # probably only revelant during package import
- if insert_contents_file_cache.has_key(cache_key):
- return
-
- # split the path into basename, and pathname
- (path, file) = os.path.split(fullpath)
-
- # Get the necessary IDs ...
- file_id = get_or_set_contents_file_id(file)
- path_id = get_or_set_contents_path_id(path)
-
- # Determine if we're inserting a duplicate row
- q = projectB.query("SELECT 1 FROM content_associations WHERE binary_pkg = '%d' AND filepath = '%d' AND filename = '%d'" % (int(bin_id), path_id, file_id))
- if q.getresult():
- # Yes we are, return without doing the insert
- return
-
- # Put them into content_assiocations
- projectB.query("INSERT INTO content_associations VALUES (DEFAULT, '%d', '%d', '%d')" % (bin_id, path_id, file_id))
- return
+def copy_temporary_contents(package, version, deb):
+ """
+ copy the previously stored contents from the temp table to the permanant one
+
+ during process-unchecked, the deb should have been scanned and the
+ contents stored in pending_content_associations
+ """
+
+ # first see if contents exist:
+
+ exists = projectB.query("""SELECT 1 FROM pending_content_associations
+ WHERE package='%s' LIMIT 1""" % package ).getresult()
+
+ if not exists:
+ # This should NOT happen. We should have added contents
+ # during process-unchecked. if it did, log an error, and send
+ # an email.
+ subst = {
+ "__PACKAGE__": package,
+ "__VERSION__": version,
+ "__TO_ADDRESS__": Cnf["Dinstall::MyAdminAddress"],
+ "__DAK_ADDRESS__": Cnf["Dinstall::MyEmailAddress"] }
+
+ message = utils.TemplateSubst(Subst, Cnf["Dir::Templates"]+"/missing-contents")
+ utils.send_mail( message )
+
+ exists = DBConn().insert_content_path(package, version, deb)
+
+ if exists:
+ sql = """INSERT INTO content_associations(binary_pkg,filepath,filename)
+ SELECT currval('binaries_id_seq'), filepath, filename FROM pending_content_associations
+ WHERE package='%s'
+ AND version='%s'""" % (package, version)
+ projectB.query(sql)
+ projectB.query("""DELETE from pending_content_associations
+ WHERE package='%s'
+ AND version='%s'""" % (package, version))
+
+ return exists