diff options
Diffstat (limited to 'lib/rubygems/package')
-rw-r--r-- | lib/rubygems/package/tar_input.rb | 12 | ||||
-rw-r--r-- | lib/rubygems/package/tar_writer.rb | 2 |
2 files changed, 7 insertions, 7 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), "..") diff --git a/lib/rubygems/package/tar_writer.rb b/lib/rubygems/package/tar_writer.rb index 823f20c88c..aeb11ad6ce 100644 --- a/lib/rubygems/package/tar_writer.rb +++ b/lib/rubygems/package/tar_writer.rb @@ -236,7 +236,7 @@ class Gem::Package::TarWriter name = newname if name.size > 100 or prefix.size > 155 then - raise Gem::Package::TooLongFileName + raise Gem::Package::TooLongFileName end end |