[DRE-commits] r5927 - in trunk/redmine/debian: . patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2010-10-15 20:09:57 +0000 (Fri, 15 Oct 2010)
New Revision: 5927

Modified:
   trunk/redmine/debian/changelog
   trunk/redmine/debian/patches/disable-deprecations.patch
Log:
Remove deprecation messages more carefully.

Modified: trunk/redmine/debian/changelog
===================================================================
--- trunk/redmine/debian/changelog	2010-10-14 23:35:27 UTC (rev 5926)
+++ trunk/redmine/debian/changelog	2010-10-15 20:09:57 UTC (rev 5927)
@@ -1,3 +1,10 @@
+redmine (1.0.2-3) unstable; urgency=low
+
+  * Disable GEM deprecation more carefully. (Closes: #599943)
+  * Remove i18n deprecation message.
+
+ -- Jérémy Lal <kapouer at melix.org>  Fri, 15 Oct 2010 21:50:28 +0200
+
 redmine (1.0.2-2) unstable; urgency=low
 
   * Update vi translation. (Closes: #598605)

Modified: trunk/redmine/debian/patches/disable-deprecations.patch
===================================================================
--- trunk/redmine/debian/patches/disable-deprecations.patch	2010-10-14 23:35:27 UTC (rev 5926)
+++ trunk/redmine/debian/patches/disable-deprecations.patch	2010-10-15 20:09:57 UTC (rev 5927)
@@ -1,14 +1,28 @@
 Deprecation warnings are not interesting for production use.
 The debian redmine maintainers are supposed to run the test suite
 before release (see README.source), so the warnings won't be missed.
---- a/config/environments/production.rb
-+++ b/config/environments/production.rb
-@@ -28,3 +28,8 @@
+--- a/config/environment.rb
++++ b/config/environment.rb
+@@ -19,6 +19,11 @@
+ # Bootstrap the Rails environment, frameworks, and default configuration
+ require File.join(File.dirname(__FILE__), 'boot')
  
- # No email in production log
- config.action_mailer.logger = nil
-+
 +# Disable deprecation warnings
-+ActiveSupport::Deprecation.silenced = true
-+Gem::Dependency.warned_version_requirement = true
++if Gem::Dependency.respond_to?('warned_version_requirement')
++  Gem::Dependency.warned_version_requirement = true
++end
 +
+ # loads cookie based session session and secret keys
+ # this is needed here because initializers are loaded after plugins,
+ # and some plugins initialize ActionController which requires a secret to be set.
+--- a/config/initializers/10-patches.rb
++++ b/config/initializers/10-patches.rb
+@@ -89,7 +89,7 @@
+     module Base
+       def warn_syntax_deprecation!
+         return if @skip_syntax_deprecation
+-        warn "The {{key}} interpolation syntax in I18n messages is deprecated. Please use %{key} instead.\nDowngrade your i18n gem to 0.3.7 (everything above must be deinstalled) to remove this warning, see http://www.redmine.org/issues/5608 for more information."
++        #warn "The {{key}} interpolation syntax in I18n messages is deprecated. Please use %{key} instead.\nDowngrade your i18n gem to 0.3.7 (everything above must be deinstalled) to remove this warning, see http://www.redmine.org/issues/5608 for more information."
+         @skip_syntax_deprecation = true
+       end
+     end