diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-22 08:24:42 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-22 08:24:42 +0000 |
| commit | 372dcece3f69989d133f720468f1e24aa1133cda (patch) | |
| tree | c173ca48a23ce18afa44feb15bf68d2dd14ac619 /lib/rubygems/installer.rb | |
| parent | d0e5a34ac7c34e70c145024a0fed8f6042814f29 (diff) | |
| download | ruby-372dcece3f69989d133f720468f1e24aa1133cda.tar.gz | |
Update to RubyGems 1.3.7.pre.1
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/installer.rb')
| -rw-r--r-- | lib/rubygems/installer.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb index 50f8d20b33..f64696fe7a 100644 --- a/lib/rubygems/installer.rb +++ b/lib/rubygems/installer.rb @@ -133,7 +133,8 @@ class Gem::Installer end FileUtils.mkdir_p @gem_home - raise Gem::FilePermissionError, @gem_home unless File.writable? @gem_home + raise Gem::FilePermissionError, @gem_home unless + options[:unpack] or File.writable? @gem_home @spec = @format.spec @@ -165,7 +166,7 @@ class Gem::Installer end if rrgv = @spec.required_rubygems_version then - unless rrgv.satisfied_by? Gem::Version.new(Gem::RubyGemsVersion) then + unless rrgv.satisfied_by? Gem::Version.new(Gem::VERSION) then raise Gem::InstallError, "#{@spec.name} requires RubyGems version #{rrgv}. " + "Try 'gem update --system' to update RubyGems itself." @@ -270,7 +271,7 @@ class Gem::Installer ## # Creates windows .bat files for easy running of commands - def generate_windows_script(bindir, filename) + def generate_windows_script(filename, bindir) if Gem.win_platform? then script_name = filename + ".bat" script_path = File.join bindir, File.basename(script_name) @@ -295,7 +296,7 @@ class Gem::Installer @spec.executables.each do |filename| filename.untaint - bin_path = File.expand_path("#{@spec.bindir}/#{filename}", @gem_dir) + bin_path = File.expand_path "#{@spec.bindir}/#{filename}", @gem_dir mode = File.stat(bin_path).mode | 0111 File.chmod mode, bin_path @@ -329,7 +330,7 @@ class Gem::Installer say bin_script_path if Gem.configuration.really_verbose - generate_windows_script bindir, filename + generate_windows_script filename, bindir #else # FileUtils.rm_f bin_script_path # FileUtils.cp exec_path, bin_script_path, |