import time
import types
import utils
-from dbconn import DBConn
+from binary import Binary
################################################################################
q = projectB.query(sql)
return map(lambda x: x[0], q.getresult())
+def get_suite_untouchable(suite):
+ """
+ Returns true if the C{suite} is untouchable, otherwise false.
+
+ @type suite: string, int
+ @param suite: the suite name or the suite_id
+
+ @rtype: boolean
+ @return: status of suite
+ """
+
+ suite_id = None
+ if type(suite) == str:
+ suite_id = get_suite_id(suite.lower())
+ elif type(suite) == int:
+ suite_id = suite
+ else:
+ return None
+
+ sql = """ SELECT untouchable FROM suite WHERE id='%s' """ % (suite_id)
+
+ q = projectB.query(sql)
+ if q.getresult()[0][0] == "f":
+ return False
+ else:
+ return True
+
################################################################################
def get_or_set_maintainer_id (maintainer):
################################################################################
-def copy_temporary_contents(package, version, deb):
+def copy_temporary_contents(package, version, arch, deb, reject):
"""
copy the previously stored contents from the temp table to the permanant one
# first see if contents exist:
+ arch_id = get_architecture_id (arch)
+
exists = projectB.query("""SELECT 1 FROM pending_content_associations
- WHERE package='%s' LIMIT 1""" % package ).getresult()
+ WHERE package='%s'
+ AND version='%s'
+ AND architecture=%d LIMIT 1"""
+ % (package, version, arch_id) ).getresult()
if not exists:
# This should NOT happen. We should have added contents
subst = {
"__PACKAGE__": package,
"__VERSION__": version,
+ "__ARCH__": arch,
"__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)
+ exists = Binary(deb, reject).scan_package()
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)
+ AND version='%s'
+ AND architecture=%d""" % (package, version, arch_id)
projectB.query(sql)
projectB.query("""DELETE from pending_content_associations
WHERE package='%s'
- AND version='%s'""" % (package, version))
+ AND version='%s'
+ AND architecture=%d""" % (package, version, arch_id))
return exists