Permalink
Browse files

do not use git version in Gemfile if env vars for tilt or rack is not…

… set

Conflicts:

	Gemfile
  • Loading branch information...
1 parent d5d3c78 commit 15dca9cac19adb67eabdfff0d041cda846bbfcd4 @rkh rkh committed May 11, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 Gemfile
View
@@ -19,7 +19,7 @@ repos = { 'tilt' => github % "rtomayko/tilt", 'rack' => github % "rack/rack" }
%w[tilt rack].each do |lib|
dep = (ENV[lib] || 'stable').sub "#{lib}-", ''
dep = nil if dep == 'stable'
- dep = {:git => repos[lib], :branch => dep} unless dep =~ /(\d+\.)+\d+/
+ dep = {:git => repos[lib], :branch => dep} if dep and dep !~ /(\d+\.)+\d+/
dep ||= '~> 1.1.0' if lib == 'rack' and RUBY_VERSION == '1.8.6'
gem lib, dep
end

0 comments on commit 15dca9c

Please sign in to comment.