From: Art Cancro <ajc@uncensored.citadel.org>
Date: Fri, 20 Jan 2012 19:27:25 +0000 (-0500)
Subject: Removed migrate_old_installs() from setup.c because the directories it removes are... 
X-Git-Tag: v8.11~236
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;ds=sidebyside;h=bc24cbba2a20773a11548a532ea26d1f31cb499e;p=citadel.git

Removed migrate_old_installs() from setup.c because the directories it removes are from ancient versions of Citadel which cannot be upgraded at this point anyway.
---

diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index 311f1b28f..2644e2da9 100644
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -1131,17 +1131,6 @@ int discover_ui(void)
 
 
 
-void migrate_old_installs(void)
-{
-	int rv;
-	rv = system("exec /bin/rm -fr ./rooms ./chatpipes ./expressmsgs ./sessions 2>/dev/null");
-	if (rv != 0)
-		fprintf(stderr, _("failed to remove old style directories.\n"));
-	unlink("citadel.log");
-	unlink("weekly");
-}
-
-
 /*
  * Strip "db" entries out of /etc/nsswitch.conf
  */
@@ -1611,8 +1600,6 @@ NEW_INST:
 
 	write_config_to_disk();
 
-        migrate_old_installs();	/* Delete files and directories used by older Citadel versions */
-
 	if (	((setup_type == UI_SILENT)
 		&& (getenv("ALTER_ETC_SERVICES")!=NULL))
 		|| (setup_type != UI_SILENT)