From ed91be9aaa3fd3373f5ca61bced2a6d844bb4b56 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sun, 17 Aug 2003 02:46:37 +0000 Subject: [PATCH] * Don't fail on "data files too old to be upgraded" for NEW installations --- citadel/ChangeLog | 4 ++++ citadel/serv_upgrade.c | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index ca078b9d1..d16da6483 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,7 @@ $Log$ + Revision 609.1 2003/08/17 02:46:37 ajc + * Don't fail on "data files too old to be upgraded" for NEW installations + Revision 609.0 2003/08/14 03:40:55 ajc * THIS IS 6.09 @@ -4961,3 +4964,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import + diff --git a/citadel/serv_upgrade.c b/citadel/serv_upgrade.c index 9e4c9324b..5edbb9138 100644 --- a/citadel/serv_upgrade.c +++ b/citadel/serv_upgrade.c @@ -187,14 +187,17 @@ void check_server_upgrades(void) { update_config(); - if (CitControl.version < 555) { + if ((CitControl.version > 000) && (CitControl.version < 555)) { lprintf(1, "Your data files are from a version of Citadel\n" "that is too old to be upgraded. Sorry.\n"); exit(EXIT_FAILURE); } - - if (CitControl.version < 591) bump_mailbox_generation_numbers(); - if (CitControl.version < 608) convert_bbsuid_to_minusone(); + if ((CitControl.version > 000) && (CitControl.version < 591)) { + bump_mailbox_generation_numbers(); + } + if ((CitControl.version > 000) && (CitControl.version < 608)) { + convert_bbsuid_to_minusone(); + } CitControl.version = REV_LEVEL; put_control(); -- 2.39.2