[DRE-commits] r5305 - trunk/redmine/debian/patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2010-05-12 20:42:24 +0000 (Wed, 12 May 2010)
New Revision: 5305

Modified:
   trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch
   trunk/redmine/debian/patches/0016-plugin_assets_in_var_dir.patch
Log:
Fix previous patch.

Modified: trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch
===================================================================
--- trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch	2010-05-12 18:46:49 UTC (rev 5304)
+++ trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch	2010-05-12 20:42:24 UTC (rev 5305)
@@ -6,7 +6,7 @@
 
 --- a/config/environment.rb
 +++ b/config/environment.rb
-@@ -18,6 +18,19 @@
+@@ -18,6 +18,20 @@
  # Bootstrap the Rails environment, frameworks, and default configuration
  require File.join(File.dirname(__FILE__), 'boot')
  
@@ -17,10 +17,11 @@
 +filename = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'session.yml') : File.join(File.dirname(__FILE__), '..', 'session.yml')
 +sessionconfig = YAML::load_file(filename)
 +require 'action_controller'
++relativeUrlRoot = ENV['RAILS_RELATIVE_URL_ROOT']
 +ActionController::Base.session = {
 +  :session_key => sessionconfig[Rails.env]['session_key'],
 +  :secret => sessionconfig[Rails.env]['secret'],
-+  :session_path => ENV['RAILS_RELATIVE_URL_ROOT'].empty? ? '/' : ENV['RAILS_RELATIVE_URL_ROOT']
++  :session_path => (relativeUrlRoot.nil? or relativeUrlRoot.empty?) ? '/' : relativeUrlRoot
 +}
 +
  # Load Engine plugin if available

Modified: trunk/redmine/debian/patches/0016-plugin_assets_in_var_dir.patch
===================================================================
--- trunk/redmine/debian/patches/0016-plugin_assets_in_var_dir.patch	2010-05-12 18:46:49 UTC (rev 5304)
+++ trunk/redmine/debian/patches/0016-plugin_assets_in_var_dir.patch	2010-05-12 20:42:24 UTC (rev 5305)
@@ -7,7 +7,7 @@
 
 --- a/config/environment.rb
 +++ b/config/environment.rb
-@@ -34,6 +34,7 @@
+@@ -35,6 +35,7 @@
  # Load Engine plugin if available
  begin
    require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')