From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Thu, 23 Sep 2010 20:34:08 +0000 (+0200)
Subject: TokyoCabinet: only warn about skipped upgrade if the old reg was found
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=4a4eff2ea8f4e2ad62305b575e1fa42b131d1365;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

TokyoCabinet: only warn about skipped upgrade if the old reg was found
---

diff --git a/lib/rbot/registry/tc.rb b/lib/rbot/registry/tc.rb
index b1b811f7..ca05ebeb 100644
--- a/lib/rbot/registry/tc.rb
+++ b/lib/rbot/registry/tc.rb
@@ -191,8 +191,8 @@ class Bot
     # NB this function is called _early_ in init(), pretty much all you have to
     # work with is @bot.botclass.
     def upgrade_data
+      oldreg = @bot.path 'registry.db'
       if defined? DBHash
-        oldreg = @bot.path 'registry.db'
         newreg = @bot.path 'plugin_registry.db'
         if File.exist?(oldreg)
           log _("upgrading old-style (rbot 0.9.5 or earlier) plugin registry to new format")
@@ -206,7 +206,7 @@ class Bot
           File.rename(oldreg, oldreg + ".old")
         end
       else
-        warning "Won't upgrade data: BDB not installed"
+        warning "Won't upgrade data: BDB not installed" if File.exist? oldreg
       end
     end