Rewrite Delivered-To to X-OLD-Delivered-To to avoid mail-loop warnings, 6

git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@141 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede

1 files changed, 2 insertions, 5 deletions

diff --git a/split-mailman-mails-and-discard-and-save b/split-mailman-mails-and-discard-and-save
index 6ef6c53..45e449f 100755
--- a/split-mailman-mails-and-discard-and-save
+++ b/split-mailman-mails-and-discard-and-save
@@ -240,14 +240,11 @@ def process_mail(filename)
 			# rewrite Delivered-To to X-OLD-Delivered-To to avoid mail loop warnings.
 			m = message.to_s.split(/\n/)
 			new_m = []
-			while true
-				break if m.size == 0
-				line = m.shift
+			while m.size > 0 and (line = m.shift) != ""
 				new_m << line.gsub(/^Delivered-To:/, 'X-OLD-Delivered-To:')
-				break if line == ""
 			end
 			new_m.concat m
-			store_in_maildir(OUTBOX_HUMANS, m.join("\n"))
+			store_in_maildir(OUTBOX_HUMANS, new_m.join("\n"))
 		end
 	else
 		STDERR.puts "Unknown action #{ACTION}!"