Adjust to deal with the new Debian supplementaryGid

[dak.git] / dak / control_suite.py

diff --git a/dak/control_suite.py b/dak/control_suite.py
index cdce40c5f5c5a141dbbde346c1b7bd53fce07748..5392259c6002ac20e15597c8123ef4eeb8ce63c3 100755 (executable)
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -75,10 +75,12 @@ Display or alter the contents of a suite using FILE(s), or stdin.
 
 def get_pkg(package, version, architecture, session):
     if architecture == 'source':
-        q = session.query(DBSource).filter_by(source=package, version=version)
+        q = session.query(DBSource).filter_by(source=package, version=version) \
+            .join(DBSource.poolfile)
     else:
         q = session.query(DBBinary).filter_by(package=package, version=version) \
-            .join(DBBinary.architecture).filter(Architecture.arch_string.in_([architecture, 'all']))
+            .join(DBBinary.architecture).filter(Architecture.arch_string.in_([architecture, 'all'])) \
+            .join(DBBinary.poolfile)
 
     pkg = q.first()
     if pkg is None:
@@ -443,9 +445,9 @@ def main ():
 
             if action == "set" and not suite.allowcsset:
                 if force:
-                    utils.warn("Would not normally allow setting suite {0} (allowsetcs is FALSE), but --force used".format(suite_name))
+                    utils.warn("Would not normally allow setting suite {0} (allowcsset is FALSE), but --force used".format(suite_name))
                 else:
-                    utils.fubar("Will not reset suite {0} due to its database configuration (allowsetcs is FALSE)".format(suite_name))
+                    utils.fubar("Will not reset suite {0} due to its database configuration (allowcsset is FALSE)".format(suite_name))
 
             if file_list:
                 for f in file_list: