X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=2e60435d1de032578c105dd20ee7bca8a1e20675;hb=c86d96790c95deed79c5ac3727361ac798c39f0f;hp=90dd5dc56996c48b63f5b8ac0f7eefaca0c1e7c1;hpb=c4458d7e67ef7780e032f5a6f2b16d1f22f7677c;p=dak.git diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index 90dd5dc5..2e60435d 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -38,7 +38,7 @@ from daklib.dak_exceptions import * from daklib.regexes import re_valid_version, re_valid_pkg_name, re_changelog_versions, \ re_strip_revision, re_strip_srcver, re_spacestrip, \ re_isanum, re_no_epoch, re_no_revision, re_taint_free, \ - re_isadeb, re_extract_src_version, re_issource + re_isadeb, re_extract_src_version, re_issource, re_default_answer from types import * @@ -289,7 +289,7 @@ def check_distributions(): (source, dest) = args[1:3] if changes["distribution"].has_key(source): for arch in changes["architecture"].keys(): - if arch not in Cnf.ValueList("Suite::%s::Architectures" % (source)): + if arch not in database.get_suite_architectures(source): reject("Mapping %s to %s for unreleased architecture %s." % (source, dest, arch),"") del changes["distribution"][source] changes["distribution"][dest] = 1 @@ -451,7 +451,7 @@ def check_files(): default_suite = Cnf.get("Dinstall::DefaultSuite", "Unstable") architecture = control.Find("Architecture") upload_suite = changes["distribution"].keys()[0] - if architecture not in Cnf.ValueList("Suite::%s::Architectures" % (default_suite)) and architecture not in Cnf.ValueList("Suite::%s::Architectures" % (upload_suite)): + if architecture not in database.get_suite_architectures(default_suite) and architecture not in database.get_suite_architectures(upload_suite): reject("Unknown architecture '%s'." % (architecture)) # Ensure the architecture of the .deb is one of the ones