From 0826cf00a0d5e9998303bcab666970abe6c3b65d Mon Sep 17 00:00:00 2001 From: Cezary Baginski Date: Fri, 2 Oct 2009 10:52:59 +0200 Subject: [PATCH] fixed racc redefinition warnings on Ruby 1.9 --- .../vendor/tmail-1.2.3/tmail/address.rb | 7 ++++++- .../vendor/tmail-1.2.3/tmail/header.rb | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/address.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/address.rb index 982ad5b..abd3b16 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/address.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/address.rb @@ -30,7 +30,12 @@ #++ require 'tmail/encode' -require 'tmail/parser' + +begin + require 'racc/parser' +rescue LoadError + require 'tmail/parser' +end module TMail diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/header.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/header.rb index dbdefcf..16577b9 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/header.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/header.rb @@ -26,7 +26,6 @@ require 'tmail/encode' require 'tmail/address' -require 'tmail/parser' require 'tmail/config' require 'tmail/utils' -- 1.6.3.3