put better error message in subject line

1 files changed, 10 insertions, 1 deletions

diff --git a/mgagnome b/mgagnome
index 4aad343..a0f5f32 100755
--- a/mgagnome
+++ b/mgagnome
@@ -628,7 +628,16 @@ def cmd_parse_ftp_release_list(options, parser):
         """Send an reply email"""
         contents.seek(0)
         msg = MIMEText(contents.read(), _charset='utf-8')
-        msg['Subject'] = "Re: %s%s" % (orig_msg['Subject'], " (ERROR)" if error else "")
+        if error:
+            # XXX - ugly
+            contents.seek(0)
+            lastline = contents.read().splitlines()[-1]
+            # Remove things like "ERROR: " and so on from the last line
+            lastline = re.sub(r'^(?:[^ :]+:\s+)+', '', lastline)
+            subjecterrror = " (ERROR: %s)" % lastline if lastline else " (ERROR)"
+        else:
+            subjecterror = ""
+        msg['Subject'] = "Re: %s%s" (orig_msg['Subject'], subjecterror)
         msg['To'] = to
         msg["In-Reply-To"] = orig_msg["Message-ID"]
         msg["References"] = orig_msg["Message-ID"]