From: Joerg Jaspert Date: Thu, 7 Aug 2008 14:15:24 +0000 (+0200) Subject: Fix a number of bugs, some introduced long ago, some introduced yesterday. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=430daaea3b7a870b4828cccb22a15b8ead3ba965;p=dak Fix a number of bugs, some introduced long ago, some introduced yesterday. --- diff --git a/ChangeLog b/ChangeLog index d32539cc..d29d7f74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-08-07 Joerg Jaspert + + * dak/cruft_report.py (parse_nfu): call utils.warn instead of warn + (main): Only do the nfu stuff if nfu is a check we want to run + later. + + * dak/make_suite_file_list.py (main): Fix a bug that has been + there for ages, but "just" never triggered. + 2008-08-07 Stephen Gran * Drop use of exec to eval variable interpolation diff --git a/dak/cruft_report.py b/dak/cruft_report.py index add44489..8640ea61 100755 --- a/dak/cruft_report.py +++ b/dak/cruft_report.py @@ -167,7 +167,7 @@ def parse_nfu(architecture): f.close() else: - warn("No wanna-build dump file for architecture %s", architecture) + utils.warn("No wanna-build dump file for architecture %s", architecture) return ret ################################################################################ @@ -435,8 +435,9 @@ def main (): sys.stderr.write("Gunzip invocation failed!\n%s\n" % (output)) sys.exit(result) - nfu_packages.setdefault(architecture,[]) - nfu_entries = parse_nfu(architecture) + if "nfu" in checks: + nfu_packages.setdefault(architecture,[]) + nfu_entries = parse_nfu(architecture) packages = utils.open_file(temp_filename) Packages = apt_pkg.ParseTagFile(packages) diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py index 7d10d42b..e3664385 100755 --- a/dak/make_suite_file_list.py +++ b/dak/make_suite_file_list.py @@ -416,7 +416,7 @@ def main(): ('n', "no-delete", "Make-Suite-File-List::Options::No-Delete"), ('f', "force", "Make-Suite-File-List::Options::Force"), ('s', "suite", "Make-Suite-File-List::Options::Suite", "HasArg")] - for i in ["architecture", "component", "help", "no-delete", "suite", "force-touch" ]: + for i in ["architecture", "component", "help", "no-delete", "suite", "force" ]: if not Cnf.has_key("Make-Suite-File-List::Options::%s" % (i)): Cnf["Make-Suite-File-List::Options::%s" % (i)] = "" apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)