[78368] branches/gsoc10-mpwa/mpwa/config/boot.rb

[jrozner at macports.org]

Revision: 78368
          http://trac.macports.org/changeset/78368
Author:   jrozner at macports.org
Date:     2011-05-04 20:00:56 -0700 (Wed, 04 May 2011)
Log Message:
-----------
leftovers form rails upgrade

Modified Paths:
--------------
    branches/gsoc10-mpwa/mpwa/config/boot.rb

Modified: branches/gsoc10-mpwa/mpwa/config/boot.rb
===================================================================
--- branches/gsoc10-mpwa/mpwa/config/boot.rb	2011-05-05 02:59:41 UTC (rev 78367)
+++ branches/gsoc10-mpwa/mpwa/config/boot.rb	2011-05-05 03:00:56 UTC (rev 78368)
@@ -1,13 +1,6 @@
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110504/3c32f70a/attachment.html>