X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fadmin.py;h=0be5e6c0a74b9d73a73706c2859324b22dc662be;hb=17c5cab4eb8d5181ec7a81267a4e2e6b43c0fc65;hp=66113b94cb40c0ad90d0a04748c42dc6368b1297;hpb=1815b13458597041ac2efa47f4aaadabe1085539;p=dak.git diff --git a/dak/admin.py b/dak/admin.py index 66113b94..0be5e6c0 100755 --- a/dak/admin.py +++ b/dak/admin.py @@ -405,7 +405,7 @@ def __suite_add_build_queue(d, args): try: build_queue_archive = session.query(Archive).filter_by(archive_name=build_queue_archive_name).one() except NoResultFound: - die("E: Unknown archive '{1}'".format(build_queue_archive_name)) + die("E: Unknown archive '{0}'".format(build_queue_archive_name)) # Create suite s = Suite() @@ -415,11 +415,15 @@ def __suite_add_build_queue(d, args): s.description = "buildd {0} incoming".format(suite_name) s.codename = build_queue_codename s.notautomatic = suite.notautomatic - s.overridesuite = suite.overridesuite + s.overridesuite = suite.overridesuite or suite.suite_name s.butautomaticupgrades = suite.butautomaticupgrades s.signingkeys = suite.signingkeys s.include_long_description = False + # Do not accept direct uploads to the build queue + s.accept_source_uploads = False + s.accept_binary_uploads = False + s.archive = build_queue_archive s.architectures.extend(suite.architectures) s.components.extend(suite.components)