--- deliantra/Deliantra-Client/DC/DB.pm	2007/12/11 02:42:38	1.24
+++ deliantra/Deliantra-Client/DC/DB.pm	2007/12/26 18:20:46	1.27
@@ -24,7 +24,13 @@
 
 use CFPlus;
 
-our $DB_HOME = "$Crossfire::VARDIR/cfplus-" . BDB::VERSION . "-$Config{archname}";
+our $DBDIR   = "cfplus-" . BDB::VERSION . "-$Config{archname}";
+our $DB_HOME = "$Deliantra::VARDIR/$DBDIR";
+
+if (!-e $DB_HOME and -e "$Deliantra::OLDDIR/$DBDIR") {
+   rename "$Deliantra::OLDDIR/$DBDIR", $DB_HOME;
+   print STDERR "INFO: moved old database from $Deliantra::OLDDIR/$DBDIR to $DB_HOME\n";
+}
 
 our $DB_ENV;
 our $DB_STATE;
@@ -389,7 +395,8 @@
          Storable::store_fd [die => $error], $fh;
       };
 
-      warn $error;
+      warn $error
+         if $error;
 
       CFPlus::_exit 0;
    }