From d9691df816f8cb68136f8a24ceebccf31270ecd7 Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Tue, 20 Mar 2012 10:37:04 +0000 Subject: put downstream names in subject if able --- mgagnome | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'mgagnome') diff --git a/mgagnome b/mgagnome index 1fb711c..681302f 100755 --- a/mgagnome +++ b/mgagnome @@ -690,10 +690,11 @@ def cmd_package_new_version(options, parser): sys.exit(1) def cmd_parse_ftp_release_list(options, parser): - def _send_reply_mail(contents, orig_msg, to, error=False): + def _send_reply_mail(contents, orig_msg, to, packages=[], error=False): """Send an reply email""" contents.seek(0) msg = MIMEText(contents.read(), _charset='utf-8') + if error: # XXX - ugly contents.seek(0) @@ -705,7 +706,13 @@ def cmd_parse_ftp_release_list(options, parser): subjecterror = " (ERROR: %s)" % lastline if lastline else " (ERROR)" else: subjecterror = "" - msg['Subject'] = "Re: %s%s" % (orig_msg['Subject'], subjecterror) + + if packages: + subject = "%s %s%s" % (", ".join(packages), orig_msg['X-Module-Version'], subjecterror) + else: + subject = "Re: %s%s" % (orig_msg['Subject'], subjecterror) + + msg['Subject'] = subject msg['To'] = to msg["In-Reply-To"] = orig_msg["Message-ID"] msg["References"] = orig_msg["Message-ID"] @@ -767,7 +774,7 @@ def cmd_parse_ftp_release_list(options, parser): if subprocess.call(cmd, stdout=stdout, stderr=stderr): error = True - if options.mail: _send_reply_mail(stdout, msg, options.mail, error=error) + if options.mail: _send_reply_mail(stdout, msg, options.mail, packages=packages, error=error) def main(): description = """Mageia GNOME commands.""" -- cgit v1.2.1