Merge branch 'develop' into xapian-dcabo

Conflicts:
	spec/models/xapian_spec.rb

1 files changed, 3 insertions, 3 deletions

diff --git a/app/models/exim_log.rb b/app/models/exim_log.rb
index 80535ab41..83f031a92 100644
--- a/app/models/exim_log.rb
+++ b/app/models/exim_log.rb
@@ -108,10 +108,10 @@ class EximLog < ActiveRecord::Base
                     # be sure we are parsing the exim line right)
                     envelope_from = " from <" + ir.incoming_email + "> "
                     if !exim_log.line.include?(envelope_from)
-                        raise "unexpected parsing of exim line"
+                        $stderr.puts("unexpected parsing of exim line: [#{exim_log.line.chomp}]")
+                    else
+                        found = true
                     end
-
-                    found = true
                 end
             end
             if !found