diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-01 05:19:16 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-01 05:19:16 +0000 |
| commit | 40cd5e8a7963a392ee0b8100b271b30f1ca0ed12 (patch) | |
| tree | 24cc1d53c429eb010d0d379e9ddb423bf4d7cec5 /lib | |
| parent | 9111bbf8182708acb9f8d9689c441c3b6c591386 (diff) | |
Merge fix for gem server, bump RubyGems version to 1.3.7
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/server.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index d2214f6e9f..d2e0f2cb5d 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -100,7 +100,7 @@ require 'etc' # -The RubyGems Team module Gem - RubyGemsVersion = VERSION = '1.3.6.1' + RubyGemsVersion = VERSION = '1.3.7' ## # Raised when RubyGems is unable to load or activate a gem. Contains the diff --git a/lib/rubygems/server.rb b/lib/rubygems/server.rb index c1a578920c..3b966f269b 100644 --- a/lib/rubygems/server.rb +++ b/lib/rubygems/server.rb @@ -797,7 +797,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; } paths = { "/gems" => "/cache/", "/doc_root" => "/doc/" } paths.each do |mount_point, mount_dir| @server.mount(mount_point, WEBrick::HTTPServlet::FileHandler, - File.join(@gem_dir.first, mount_dir), true) + File.join(@gem_dirs.first, mount_dir), true) end trap("INT") { @server.shutdown; exit! } |