X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Frm.py;h=d7697fa426a0bd510aeb47d1921aa90fa33bb10c;hb=058589fa46defeedbb6e22d4eb71bec3ccc92d3d;hp=ff45092755204e1c77da6a13f2fbf3935e961d10;hpb=716cb1ee7ea468f4b626425fd518223711ef732b;p=dak.git diff --git a/dak/rm.py b/dak/rm.py index ff450927..d7697fa4 100755 --- a/dak/rm.py +++ b/dak/rm.py @@ -75,7 +75,7 @@ Remove PACKAGE(s) from suite(s). -S, --source-only remove source only ARCH, BUG#, COMPONENT and SUITE can be comma (or space) separated lists, e.g. - --architecture=m68k,i386""" + --architecture=amd64,i386""" sys.exit(exit_code) @@ -399,7 +399,7 @@ def main (): for i in source_packages.keys(): filename = "/".join(source_packages[i]) try: - dsc = utils.parse_changes(filename) + dsc = utils.parse_changes(filename, dsc_file=1) except CantOpenError: utils.warn("couldn't open '%s'." % (filename)) continue @@ -554,9 +554,10 @@ def main (): if carbon_copy: Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy) Subst["__SUITE_LIST__"] = suites_list - summarymail = "%s\n------------------- Reason -------------------\n%s\n" % (Options["Reason"]) + summarymail = "%s\n------------------- Reason -------------------\n%s\n" % (summary, Options["Reason"]) summarymail += "----------------------------------------------\n" Subst["__SUMMARY__"] = summarymail + Subst["__SUBJECT__"] = "Removed package(s) from %s" % (suites_list) Subst["__ADMIN_ADDRESS__"] = cnf["Dinstall::MyAdminAddress"] Subst["__DISTRO__"] = cnf["Dinstall::MyDistribution"] Subst["__WHOAMI__"] = whoami