test_gpg.py: also check signature timestamp

[dak.git] / dak / init_dirs.py

diff --git a/dak/init_dirs.py b/dak/init_dirs.py
index 32c8f589b4e8e24c37741ce3716f2fe0badd5685..0e0d33a94ea85f8d3b573ada62a57145887c726a 100755 (executable)
--- a/dak/init_dirs.py
+++ b/dak/init_dirs.py
@@ -103,7 +103,7 @@ def process_keyring(fullpath, secret=False):
 ######################################################################
 
 def create_directories():
-    """Create directories referenced in dak.conf and apt.conf."""
+    """Create directories referenced in dak.conf."""
 
     session = DBConn().session()
 
@@ -131,13 +131,13 @@ def create_directories():
         process_keyring(Cnf['Dinstall::SigningPubKeyring'], secret=True)
 
     # Process public keyrings
-    for keyring in session.query(Keyring).all():
+    for keyring in session.query(Keyring).filter_by(active=True):
         process_keyring(keyring.keyring_name)
 
     # Process dists directories
     # TODO: Store location of each suite in database
     for suite in session.query(Suite):
-        suite_dir = os.path.join( Cnf['Dir::Root'], 'dists', "%s/%s" % (suite.suite_name, suite_suffix) )
+        suite_dir = os.path.join(suite.archive.path, 'dists', suite.suite_name, suite_suffix)
 
         # TODO: Store valid suite/component mappings in database
         for component in session.query(Component):