Download as
Browse Code »

Commit 095531ac941eee0b212ade880c3248af4815b624

Authored by Braulio Bhavamitra
Committed by Antonio Terceiro
1 parent 93103d85
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Don't force a non-existing Debian-installed Rails 

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
config/boot.rb
  Diff comments   View file @095531a
... ... @@ -109,7 +109,7 @@ end
109 109 def install_debian_rails
110 110 local_rails = File.dirname(__FILE__) + '/../vendor/rails'
111 111 debian_rails = ['/usr/share/rails-ruby1.8', '/usr/lib/ruby/vendor_ruby/rails'].find { |d| File.exists?(d) }
112   - if !File.exist?(local_rails) && File.exists?(debian_rails)
  112 + if !File.exist?(local_rails) && debian_rails && File.exists?(debian_rails)
113 113 File.delete(local_rails) if File.symlink?(local_rails) # remove dangling symlink
114 114 puts "I: Installing Debian-installed Rails from /usr/share/rails into vendor/rails."
115 115 recommended_rails_version = Rails::GemBoot.gem_version
... ...