[DRE-commits] [redmine] 09/15: lib/tasks/initializers.rake: always set RAILS_ETC

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository redmine.

commit 95b4e146a55b4ebfc7fb608a0d5086b1189ef47b
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri May 1 17:13:43 2015 -0300

    lib/tasks/initializers.rake: always set RAILS_ETC
---
 debian/changelog                                     | 3 +++
 debian/patches/2003_externalize_session_config.patch | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ea4f7dd..f589176 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ redmine (3.0~20140825-6) UNRELEASED; urgency=medium
   * debian/postinst: run rake under `bundle exec` to correctly handle
     upgrades when the local admin installed non-packaged plugins (i.e. ~100%
     of them). Closes: #779273
+    - debian/patches/2003_externalize_session_config.patch: always set
+      RAILS_ETC unconditionally from X_DEBIAN_SITEID because the load order
+      under `bundle exec` seems to be a little different.
   * debian/postinst: initialize variable that will hold the return code of a
     potentially failing command to 0 so it is not undefined if the command
     suceeeds. Closes: #780894
diff --git a/debian/patches/2003_externalize_session_config.patch b/debian/patches/2003_externalize_session_config.patch
index 8046947..9412ed5 100644
--- a/debian/patches/2003_externalize_session_config.patch
+++ b/debian/patches/2003_externalize_session_config.patch
@@ -15,7 +15,7 @@ Last-Update: 2010-01-10
 -    f.write <<"EOF"
 -# This file was generated by 'rake generate_secret_token', and should
 +ENV['X_DEBIAN_SITEID'] ||= 'default'
-+ENV['RAILS_ETC'] ||= "/etc/redmine/#{ENV['X_DEBIAN_SITEID']}"
++ENV['RAILS_ETC'] = "/etc/redmine/#{ENV['X_DEBIAN_SITEID']}"
 +filename = ENV['YML_SESSION_FILENAME'] ? ENV['YML_SESSION_FILENAME'] : 'session.yml'
 +path = File.join(ENV['RAILS_ETC'] ? ENV['RAILS_ETC'] : File.join(Rails.root, 'config'), filename)
 +secret = SecureRandom.hex(40)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git