summaryrefslogtreecommitdiffstats
path: root/mgagnome
diff options
context:
space:
mode:
authorOlav Vitters <ovitters@mageia.org>2012-03-20 10:37:04 +0000
committerOlav Vitters <ovitters@mageia.org>2012-03-20 10:37:04 +0000
commitd9691df816f8cb68136f8a24ceebccf31270ecd7 (patch)
treefb786524765bd011022700c6c4c585aacda6239a /mgagnome
parentc15cc3d6c62b3e33af2c6dd58552fbcc63b2d8c4 (diff)
downloadmgagnome-d9691df816f8cb68136f8a24ceebccf31270ecd7.tar
mgagnome-d9691df816f8cb68136f8a24ceebccf31270ecd7.tar.gz
mgagnome-d9691df816f8cb68136f8a24ceebccf31270ecd7.tar.bz2
mgagnome-d9691df816f8cb68136f8a24ceebccf31270ecd7.tar.xz
mgagnome-d9691df816f8cb68136f8a24ceebccf31270ecd7.zip
put downstream names in subject if able
Diffstat (limited to 'mgagnome')
-rwxr-xr-xmgagnome13
1 files changed, 10 insertions, 3 deletions
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."""