← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/rubygems/custom_require.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/custom_require.rb
4
4
# See LICENSE.txt for permissions.
5
5
#++
6
6
 
7
 
require 'rubygems'
8
 
 
9
7
module Kernel
10
8
 
11
9
  ##
30
28
  def require(path) # :doc:
31
29
    gem_original_require path
32
30
  rescue LoadError => load_error
33
 
    if load_error.message =~ /#{Regexp.escape path}\z/ and
34
 
       spec = Gem.searcher.find(path) then
35
 
      Gem.activate(spec.name, "= #{spec.version}")
36
 
      gem_original_require path
37
 
    else
38
 
      raise load_error
 
31
    if load_error.message.end_with?(path)
 
32
      if Gem.try_activate(path)
 
33
        return gem_original_require(path)
 
34
      end
39
35
    end
 
36
 
 
37
    raise load_error
40
38
  end
41
39
 
42
40
  private :require
43
41
  private :gem_original_require
44
42
 
45
 
end
 
43
end unless Kernel.private_method_defined?(:gem_original_require)
46
44