← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ruby1.9.1/quantal

« back to all changes in this revision

Viewing changes to lib/rubygems/commands/mirror_command.rb

  • Committer: Bazaar Package Importer
  • Author(s): Lucas Nussbaum
  • Date: 2010-07-31 17:08:39 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100731170839-j034dmpdqt1cc4p6
Tags: 1.9.2~svn28788-1
http://bugs.debian.org/580852
http://bugs.debian.org/590002
http://bugs.debian.org/543805
http://bugs.debian.org/542927
* New release based on upstream snapshot from the 1.9.2 branch,
  after 1.9.2 RC2. That branch is (supposed to be) binary-compatible
  with the 1.9.1 branch.
  + Builds fine on i386. Closes: #580852.
* Upgrade to Standards-Version: 3.9.1. No changes needed.
* Updated generated incs.
* Patches that still need work:
  + Unclear status, need more investigation:
   090729_fix_Makefile_deps.dpatch
   090803_exclude_rdoc.dpatch
   203_adjust_base_of_search_path.dpatch
   902_define_YAML_in_yaml_stringio.rb.dpatch
   919_common.mk_tweaks.dpatch
   931_libruby_suffix.dpatch
   940_test_thread_mutex_sync_shorter.dpatch
  + Maybe not needed anymore, keeping but not applying.
   102_skip_test_copy_stream.dpatch (test doesn't block anymore?)
   104_skip_btest_io.dpatch (test doesn't block anymore?)
   201_gem_prelude.dpatch (we don't use that rubygems anyway?)
   202_gem_default_dir.dpatch (we don't use that rubygems anyway?)
   940_test_file_exhaustive_fails_as_root.dpatch
   940_test_priority_fails.dpatch
   100518_load_libc_libm.dpatch
* Add disable-tests.diff: disable some tests that cause failures on FreeBSD.
  Closes: #590002, #543805, #542927.
* However, many new failures on FreeBSD. Since that version is still an
  improvement, add the check that makes test suite failures non-fatal on
  FreeBSD again. That still needs to be investigated.
* Re-add 903_skip_base_ruby_check.dpatch
* Add build-dependency on ruby1.8 and drop all pre-generated files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/rubygems/commands/mirror_command.rb
51
51
        Dir.mkdir gems_dir
52
52
      end
53
53
 
54
 
      sourceindex_data = ''
 
54
      source_index_data = ''
55
55
 
56
56
      say "fetching: #{get_from}/Marshal.#{Gem.marshal_version}.Z"
57
57
 
70
70
      end
71
71
 
72
72
      open File.join(get_from.to_s, "Marshal.#{Gem.marshal_version}.Z"), "rb" do |y|
73
 
        sourceindex_data = Zlib::Inflate.inflate y.read
 
73
        source_index_data = Zlib::Inflate.inflate y.read
74
74
        open File.join(save_to, "Marshal.#{Gem.marshal_version}"), "wb" do |out|
75
 
          out.write sourceindex_data
 
75
          out.write source_index_data
76
76
        end
77
77
      end
78
78
 
79
 
      sourceindex = Marshal.load(sourceindex_data)
 
79
      source_index = Marshal.load source_index_data
80
80
 
81
 
      progress = ui.progress_reporter sourceindex.size,
82
 
                                      "Fetching #{sourceindex.size} gems"
83
 
      sourceindex.each do |fullname, gem|
84
 
        gem_file = "#{fullname}.gem"
 
81
      progress = ui.progress_reporter source_index.size,
 
82
                                      "Fetching #{source_index.size} gems"
 
83
      source_index.each do |fullname, gem|
 
84
        gem_file = gem.file_name
85
85
        gem_dest = File.join gems_dir, gem_file
86
86
 
87
87
        unless File.exist? gem_dest then