X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Foverride.py;h=44fc16f412492ee86f05efdbf8e7806b6e2de2fb;hb=aa4f71d8e30c23e458a8148be258c89bffbd405f;hp=a9f28322f1edfd7f74d323e9c1ee8a3ea63fe273;hpb=9427ebbb129f023f065c1ad34290ce74f9f8b83b;p=dak.git diff --git a/dak/override.py b/dak/override.py index a9f28322..44fc16f4 100755 --- a/dak/override.py +++ b/dak/override.py @@ -56,7 +56,7 @@ Make microchanges or microqueries of the binary overrides """ sys.exit(exit_code) -def check_override_compliance(package, priority, suite_name, cnf, session): +def check_override_compliance(package, priority, archive_path, suite_name, cnf, session): print "Checking compliance with related overrides..." depends = set() @@ -66,7 +66,7 @@ def check_override_compliance(package, priority, suite_name, cnf, session): arches -= set(["source", "all"]) for arch in arches: for component in components: - Packages = utils.get_packages_from_ftp(cnf['Dir::Root'], suite_name, component, arch) + Packages = utils.get_packages_from_ftp(archive_path, suite_name, component, arch) while Packages.Step(): package_name = Packages.Section.Find("Package") dep_list = Packages.Section.Find("Depends") @@ -140,6 +140,10 @@ def main (): if arguments and len(arguments) > 2: utils.fubar("Too many arguments") + suite = get_suite(suite_name, session) + if suite is None: + utils.fubar("Unknown suite '{0}'".format(suite_name)) + if arguments and len(arguments) == 1: # Determine if the argument is a priority or a section... arg = arguments.pop() @@ -227,7 +231,7 @@ def main (): utils.fubar("Trying to change priority of a source-only package") if Options["Check"] and newpriority != oldpriority: - check_override_compliance(package, p, suite_name, cnf, session) + check_override_compliance(package, p, suite.archive.path, suite_name, cnf, session) # If we're in no-action mode if Options["No-Action"]: