X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=dak%2Finit_dirs.py;h=347945a3e8c037ac6a0d428b5a798592e8e69a7b;hp=fd1407143f0c1e759f75845f59a430b0b3ae7bc7;hb=026bdb9580e6d18bf504d2f44d46890df5d89f1a;hpb=129ee05ec943535f154032b73cca5f96c161540f diff --git a/dak/init_dirs.py b/dak/init_dirs.py index fd140714..347945a3 100755 --- a/dak/init_dirs.py +++ b/dak/init_dirs.py @@ -103,16 +103,23 @@ 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() # Process directories from dak.conf process_tree(Cnf, "Dir") + # Hardcode creation of the unchecked directory + if Cnf.has_key("Dir::Base"): + do_dir(os.path.join(Cnf["Dir::Base"], "queue", "unchecked"), 'unchecked directory') + # Process queue directories for queue in session.query(PolicyQueue): do_dir(queue.path, '%s queue' % queue.queue_name) + # If we're doing the NEW queue, make sure it has a COMMENTS directory + if queue.queue_name == 'new': + do_dir(os.path.join(queue.path, "COMMENTS"), '%s queue comments' % queue.queue_name) for config_name in [ "Rm::LogFile", "Import-Archive::ExportDir" ]: @@ -137,7 +144,7 @@ def create_directories(): # 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):