Don't raise an error on rails settings failure

backlogs · Mar 16, 2012 · 200e111 · Vanuan · Mar 17, 2012 · retorquere
1 parent 6d45cae
commit 200e111
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 103 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ lib/labels-malformed.yaml
 graph.dot
 nbproject
 *.rc
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,7 @@ gem "prawn"
 gem "system_timer" if RUBY_VERSION =~ /^1\.8\./ && RUBY_PLATFORM =~ /darwin|linux/
 
 # development gems, sorted alphabetically
-group :development do
+if ENV['backlogs_dev'] == 'true'
   gem 'ZenTest', "=4.5.0" # 4.6.0 has a nasty bug that breaks autotest
   gem 'autotest-rails'
   gem "capybara", "=0.3.9"

diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/lib/backlogs_setup.rb b/lib/backlogs_setup.rb
@@ -145,10 +145,9 @@ def to_h
     def safe_load
       settings = Setting.plugin_redmine_backlogs.dup
       if settings.is_a?(String)
-        Setting.connection.execute("select value from settings where name = 'plugin_redmine_backlogs'").each{|v| settings = v}
-        settings = YAML::load(settings)
+        RAILS_DEFAULT_LOGGER.error "Unable to load settings"
+        return {}
       end
-      raise "Unable to load settings" if settings.is_a?(String)
       settings
     end
   end

diff --git a/rbl-reinstall b/rbl-reinstall
@@ -195,7 +195,7 @@ if [ "$GEMSET" = "chiliproject" ]; then
   if [[ $RVM =~ [Yy] ]]; then
     cd ~/redmine/chiliproject
     sed -i -e"s/gem 'capybara'/gem 'capybara', '=0.3.9'/" Gemfile
-    bundle install
+    bundle install redmine_dev=true
   fi
 
   if [[ $CPINSTALL =~ [Yy] ]]; then