X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Frm.py;h=62c5f98052b844b4d994314fedcdd829095b4329;hb=1f351aa3e676e93c926045a90dd93574ba412664;hp=5911eb40e3e19a11ec6b98a9944cc9d07ef84eef;hpb=fa8582a41855d39d864495f1bc0b28805d992ad1;p=dak.git diff --git a/dak/rm.py b/dak/rm.py index 5911eb40..62c5f980 100755 --- a/dak/rm.py +++ b/dak/rm.py @@ -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 @@ -492,7 +492,7 @@ def main (): game_over() whoami = utils.whoami() - date = commands.getoutput('date -R').strip() + date = commands.getoutput('date -R') # Log first; if it all falls apart I want a record that we at least tried. logfile = utils.open_file(cnf["Rm::LogFile"], 'a') @@ -557,7 +557,7 @@ def main (): summarymail = "%s\n------------------- Reason -------------------\n%s\n" % (summary, Options["Reason"]) summarymail += "----------------------------------------------\n" Subst["__SUMMARY__"] = summarymail - Subst["__SUBJECT__"] = "Removed package(s) from %s" % (suite_list) + Subst["__SUBJECT__"] = "Removed package(s) from %s" % (suites_list) Subst["__ADMIN_ADDRESS__"] = cnf["Dinstall::MyAdminAddress"] Subst["__DISTRO__"] = cnf["Dinstall::MyDistribution"] Subst["__WHOAMI__"] = whoami