[DRE-commits] [redmine] 15/15: gemfile-adjustments.patch: refresh

[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 2d5dc174bcbf13dfa834f6f53c2054ae8b05d87a
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat May 2 17:50:11 2015 -0300

    gemfile-adjustments.patch: refresh
---
 debian/changelog                         |  3 +++
 debian/patches/gemfile-adjustments.patch | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a04626..d6de741 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,9 @@ redmine (3.0~20140825-6) unstable; urgency=medium
     - don't install deprecated script/ directory
   * debian/doc/examples/apache2-passenger-*.conf: document line that must
     be changed in extra instances.
+  * debian/patches/gemfile-adjustments.patch:
+    - bump dependency on redcarpet
+    - don't try to read database.yml is it's not readable
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 02 May 2015 11:33:20 -0300
 
diff --git a/debian/patches/gemfile-adjustments.patch b/debian/patches/gemfile-adjustments.patch
index ece642d..3a2f6e1 100644
--- a/debian/patches/gemfile-adjustments.patch
+++ b/debian/patches/gemfile-adjustments.patch
@@ -28,18 +28,29 @@
    gem "rack-openid"
  end
  
-@@ -46,7 +46,10 @@ end
+@@ -32,7 +32,7 @@ platforms :mri, :mingw do
+ 
+   # Optional Markdown support, not for JRuby
+   group :markdown do
+-    gem "redcarpet", "~> 3.1.2"
++    gem "redcarpet", "~> 3.1"
+   end
+ end
+ 
+@@ -46,8 +46,11 @@ end
  # configuration file
  require 'erb'
  require 'yaml'
 -database_file = File.join(File.dirname(__FILE__), "config/database.yml")
+-if File.exist?(database_file)
 +# FIXME duplicating logic in config/application.rb
 +ENV['X_DEBIAN_SITEID'] ||= 'default'
 +ENV['RAILS_ETC'] = "/etc/redmine/#{ENV['X_DEBIAN_SITEID']}"
 +database_file = File.join(ENV['RAILS_ETC'], "database.yml")
- if File.exist?(database_file)
++if File.readable?(database_file)
    database_config = YAML::load(ERB.new(IO.read(database_file)).result)
    adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
+   if adapters.any?
 @@ -78,21 +81,6 @@ else
    warn("Please configure your config/database.yml first")
  end

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