Set internal version number to 902.

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 53606e3a34fa523f7a9ccb6bab1fca6f508f9f45..6a7312eb86acbed31283c9990e64969f2fbe16fb 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -45,7 +45,7 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      901             /* This version */
+#define REV_LEVEL      902             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
 #define EXPORT_REV_MIN 760             /* Oldest compatible export files */
 #define LIBCITADEL_MIN 901             /* Minimum required version of libcitadel */

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 1db8cbf161c20b85493bc96deec8ca5ab408b1a1..8be48ba07ac5c2d158d4b3029a2e6d368c9b7abd 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
-AC_INIT([Citadel], [901], [http://www.citadel.org/])
+AC_INIT([Citadel], [902], [http://www.citadel.org/])
 AC_REVISION([$Revision: 5108 $])
 AC_CONFIG_SRCDIR([citserver.c])
 AC_CONFIG_HEADER(sysdep.h)

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index 6526999275cd19827fbd1e0e3f9e8bb6afcf192c..d4cd4904b81f380c3c62ffaa22d14972e5bbd94c 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -432,9 +432,7 @@ void check_server_upgrades(void) {
        syslog(LOG_INFO, "Existing database version on disk is %d", CtdlGetConfigInt("MM_hosted_upgrade_level"));
 
        if (CtdlGetConfigInt("MM_hosted_upgrade_level") < REV_LEVEL) {
-               syslog(LOG_WARNING,
-                       "Server hosted updates need to be processed at this time.  Please wait..."
-               );
+               syslog(LOG_WARNING, "Server hosted updates need to be processed at this time.  Please wait...");
        }
        else {
                return;
@@ -500,7 +498,6 @@ void check_server_upgrades(void) {
 CTDL_MODULE_UPGRADE(upgrade)
 {
        check_server_upgrades();
-       ingest_old_roominfo_and_roompic_files();        // FIXME remove this line, it's proper above!!!!
        
        /* return our module id for the Log */
        return "upgrade";