Replace os.popen with the subprocess.Popen in a few places.

[dak.git] / dak / generate_releases.py

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index c1cad6bd9ca787bde583b8246bc0523ab0fa09ba..e483e6c22bba3f977e96d3491bffa302fce10dbc 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -83,7 +83,7 @@ def sign_release_dir(suite, dirname):
         if cnf.has_key("Dinstall::SigningPubKeyring"):
             keyring += " --keyring \"%s\"" % cnf["Dinstall::SigningPubKeyring"]
 
-        arguments = "--no-options --batch --no-tty --armour"
+        arguments = "--no-options --batch --no-tty --armour --personal-digest-preferences=SHA256"
 
         relname = os.path.join(dirname, 'Release')
 
@@ -95,8 +95,9 @@ def sign_release_dir(suite, dirname):
         if os.path.exists(inlinedest):
             os.unlink(inlinedest)
 
+        defkeyid=""
         for keyid in suite.signingkeys or []:
-            defkeyid = "--local-user %s" % keyid
+            defkeyid += "--local-user %s " % keyid
 
         os.system("gpg %s %s %s --detach-sign <%s >>%s" %
                   (keyring, defkeyid, arguments, relname, dest))
@@ -169,7 +170,7 @@ class ReleaseWriter(object):
 
         out.write("Architectures: %s\n" % (" ".join([a.arch_string for a in architectures])))
 
-        components = [ c.component_name for c in session.query(Component) ]
+        components = [ c.component_name for c in suite.components ]
 
         out.write("Components: %s\n" % (" ".join(components)))