[registry] fix subregistry re-use (closes #1)

[user/henk/code/ruby/rbot.git] / lib / rbot / rbotconfig.rb

diff --git a/lib/rbot/rbotconfig.rb b/lib/rbot/rbotconfig.rb
index 97f8173eaa2dbaa0082f8bccd1c09c7f3af974a9..eb55f96533e24eda007f39ce61e8c5c268b7e2f2 100644 (file)
--- a/lib/rbot/rbotconfig.rb
+++ b/lib/rbot/rbotconfig.rb
@@ -27,12 +27,12 @@ class Bot
       begin
         debug "trying to load rubygems"
         require 'rubygems'
-        debug "loaded rubygems, looking for rbot-#$version"
-        if $version =~ /(.*)-(svn|git)\Z/
+        if $version =~ /^(.*)-(?:git|rc\d)(?: .*)?$/
           version = $1
         else
           version = $version
         end
+        debug "loaded rubygems, looking for rbot version #{$version} (rbot-#{version})"
         gemname, gem = Gem.source_index.find{|name, spec| spec.name == 'rbot' && spec.version.version == version}
         debug "got gem #{gem}"
         if gem && path = gem.full_gem_path