[DRE-commits] [redmine] 02/05: multi-tenancy: don't try to load files that are not readable

[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 28a74f530a29e708a8360838280219745c0d9a66
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jun 12 20:54:41 2016 -0300

    multi-tenancy: don't try to load files that are not readable
    
    Closes: #826663
---
 debian/changelog                                    | 2 ++
 debian/patches/0004-Add-multi-tenancy-support.patch | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cadf175..7751e12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ redmine (3.2.3-2) UNRELEASED; urgency=medium
 
   * debian/postinst: handle dependency check failure when triggered, to avoid
     breaking in the middle of dist-upgrades.
+  * 0004-Add-multi-tenancy-support.patch: don't try to load files that are not
+    readable (Closes: #826663)
 
  -- Antonio Terceiro <terceiro at debian.org>  Sun, 12 Jun 2016 20:49:25 -0300
 
diff --git a/debian/patches/0004-Add-multi-tenancy-support.patch b/debian/patches/0004-Add-multi-tenancy-support.patch
index dffa51d..58df948 100644
--- a/debian/patches/0004-Add-multi-tenancy-support.patch
+++ b/debian/patches/0004-Add-multi-tenancy-support.patch
@@ -47,7 +47,7 @@ index 173b030..d9e39ef 100644
  /lib/redmine/scm/adapters/mercurial/redminehelper.pyo
  /log/*.log*
 diff --git a/Gemfile b/Gemfile
-index 828ce70..382431a 100644
+index 828ce70..bff7860 100644
 --- a/Gemfile
 +++ b/Gemfile
 @@ -59,12 +59,17 @@ end
@@ -59,7 +59,7 @@ index 828ce70..382431a 100644
 +
 +seen_adapters = {}
 +Dir['{config,instances/*/config}/database.yml'].select do |f|
-+  File.exists?(f)
++  File.readable?(f)
 +end.each do |database_file|
    database_config = YAML::load(ERB.new(IO.read(database_file)).result)
    adapters = database_config.values.map {|c| c['adapter']}.compact.uniq

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