get error message from last non-empty line

1 files changed, 2 insertions, 1 deletions

diff --git a/mgagnome b/mgagnome
index 9cdfae1..944b373 100755
--- a/mgagnome
+++ b/mgagnome
@@ -695,7 +695,7 @@ def cmd_parse_ftp_release_list(options, parser):
         if error:
             # XXX - ugly
             contents.seek(0)
-            lastline = contents.read().splitlines()[-1]
+            lastline = contents.read().rstrip().splitlines()[-1]
             # Remove things like "ERROR: " and so on from the last line
             lastline = re.sub(r'^(?:[^ :]+:\s+)+', '', lastline)
             subjecterror = " (ERROR: %s)" % lastline if lastline else " (ERROR)"
@@ -850,4 +850,5 @@ def main():
         sys.exit(0)
 
 if __name__ == "__main__":
+    os.environ['PYTHONUNBUFFERED'] = '1'
     main()