diff options
| author | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-01 03:45:05 +0000 |
|---|---|---|
| committer | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-01 03:45:05 +0000 |
| commit | d22130922e7842226d38d59680e4bbb48a28a5f0 (patch) | |
| tree | 39594d3a14641dd5488a99a5e633239296fa5742 /lib/rubygems/package/tar_input.rb | |
| parent | 4752539e3f3e563d559732c52424206bd6f12dbd (diff) | |
| download | ruby-d22130922e7842226d38d59680e4bbb48a28a5f0.tar.gz | |
Import rubygems 1.8.5 (released @ 137c80f)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31885 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, 6 insertions, 6 deletions
diff --git a/lib/rubygems/package/tar_input.rb b/lib/rubygems/package/tar_input.rb index 401df80a83..92c190c56a 100644 --- a/lib/rubygems/package/tar_input.rb +++ b/lib/rubygems/package/tar_input.rb @@ -55,6 +55,7 @@ class Gem::Package::TarInput sio.rewind end + # TODO use Gem.gunzip gzis = Zlib::GzipReader.new(sio || entry) # YAML wants an instance of IO @metadata = load_gemspec(gzis) @@ -115,7 +116,6 @@ class Gem::Package::TarInput end @tarreader.rewind - @fileops = Gem::FileOperations.new unless has_meta then path = io.path if io.respond_to? :path @@ -151,9 +151,9 @@ class Gem::Package::TarInput dest = File.join destdir, entry.full_name if File.directory? dest then - @fileops.chmod entry.header.mode, dest, :verbose => false + FileUtils.chmod entry.header.mode, dest, :verbose => false else - @fileops.mkdir_p dest, :mode => entry.header.mode, :verbose => false + FileUtils.mkdir_p dest, :mode => entry.header.mode, :verbose => false end fsync_dir dest @@ -165,9 +165,9 @@ class Gem::Package::TarInput # it's a file md5 = Digest::MD5.new if expected_md5sum destdir = File.join destdir, File.dirname(entry.full_name) - @fileops.mkdir_p destdir, :mode => 0755, :verbose => false + FileUtils.mkdir_p destdir, :mode => 0755, :verbose => false destfile = File.join destdir, File.basename(entry.full_name) - @fileops.chmod 0600, destfile, :verbose => false rescue nil # Errno::ENOENT + FileUtils.chmod 0600, destfile, :verbose => false rescue nil # Errno::ENOENT open destfile, "wb", entry.header.mode do |os| loop do @@ -181,7 +181,7 @@ class Gem::Package::TarInput os.fsync end - @fileops.chmod entry.header.mode, destfile, :verbose => false + FileUtils.chmod entry.header.mode, destfile, :verbose => false fsync_dir File.dirname(destfile) fsync_dir File.join(File.dirname(destfile), "..") |