Merge commit 'ftpmaster/master'

[dak.git] / daklib / database.py

diff --git a/daklib/database.py b/daklib/database.py
index c274a637a84fd54c0af32075056dce5e6341c930..7ac6f2cce116895e225cd2875fc89a1a7224c786 100755 (executable)
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -32,6 +32,8 @@
 import sys
 import time
 import types
+import utils
+from binary import Binary
 
 ################################################################################
 
@@ -484,6 +486,33 @@ def get_suite_architectures(suite):
     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)
+    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):
@@ -809,7 +838,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
 
@@ -832,10 +861,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)