X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fadmin.py;h=60428cfb2afa0e5a761170ce49beeb98bcefd2ae;hb=5a61a05250b1bf5d54661103e8999eb7c7fc9207;hp=07e60dddfdfad2b3b63264428dddf0e4988884c1;hpb=a76c9aa65fa5dfc2f267e8ee7c43c850581e2515;p=dak.git diff --git a/dak/admin.py b/dak/admin.py index 07e60ddd..60428cfb 100755 --- a/dak/admin.py +++ b/dak/admin.py @@ -322,6 +322,9 @@ def __suite_add(d, args, addallarches=False): version = args[3] rest = args[3:] + if len(version) == 0: + version = None + def get_field(field): for varval in args: if varval.startswith(field + '='): @@ -402,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() @@ -412,7 +415,7 @@ 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