Changeset 503

Show
Ignore:
Timestamp:
09/04/07 10:59:55 (1 year ago)
Author:
iv..@gweezlebur.com
Message:

don't use system libs if a gem >=< version was specified

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb/gems.rb

    r493 r503  
    4747        list_required(timing).each do |gemname,version| 
    4848          @loaded = true 
    49           version = ">= #{version}" unless version =~ /[=><]/ 
     49          if version =~ /[=><]/ 
     50            @explicit_version = true 
     51          else 
     52            version = ">= #{version}" 
     53          end 
    5054          begin 
    5155            local_path = File.join(MERB_ROOT, 'gems', "#{gemname}-#{version}", "lib") 
    …… 
    5660              gem gemname, "= #{version}" 
    5761            else 
    58               require gemname 
     62              require gemname unless @explicit_version 
    5963            end 
    6064          rescue LoadError