diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-09 21:38:59 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-09 21:38:59 +0000 |
| commit | 31c94ffeb5f09d09ac2c86fc9e6614e38251a43d (patch) | |
| tree | 10e44506238c7af3d7c9d822111996731726e38d /lib/rubygems/package/tar_input.rb | |
| parent | a6afbaeb3be396c0fdea3b9077d9256c59edcfca (diff) | |
Update to RubyGems 1.3.4 r2223
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/package/tar_input.rb')
| -rw-r--r-- | lib/rubygems/package/tar_input.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/rubygems/package/tar_input.rb b/lib/rubygems/package/tar_input.rb index 2ed3d6b772..9f901023b8 100644 --- a/lib/rubygems/package/tar_input.rb +++ b/lib/rubygems/package/tar_input.rb @@ -3,8 +3,6 @@ # See LICENSE.txt for additional licensing information. #-- -require 'rubygems/package' - class Gem::Package::TarInput include Gem::Package::FSyncDir @@ -72,9 +70,9 @@ class Gem::Package::TarInput # map trust policy from string to actual class (or a serialized YAML # file, if that exists) if String === security_policy then - if Gem::Security::Policy.key? security_policy then + if Gem::Security::Policies.key? security_policy then # load one of the pre-defined security policies - security_policy = Gem::Security::Policy[security_policy] + security_policy = Gem::Security::Policies[security_policy] elsif File.exist? security_policy then # FIXME: this doesn't work yet security_policy = YAML.load File.read(security_policy) @@ -136,10 +134,10 @@ class Gem::Package::TarInput def extract_entry(destdir, entry, expected_md5sum = nil) if entry.directory? then - dest = File.join(destdir, entry.full_name) + dest = File.join destdir, entry.full_name - if File.dir? dest then - @fileops.chmod entry.header.mode, dest, :verbose=>false + if File.directory? dest then + @fileops.chmod entry.header.mode, dest, :verbose => false else @fileops.mkdir_p dest, :mode => entry.header.mode, :verbose => false end |