remove extra log message

[citadel.git] / citadel / modules / upgrade / serv_upgrade.c

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index d4cd4904b81f380c3c62ffaa22d14972e5bbd94c..4d3c50bd7e0037e4fb68257e00fa8b20f5e756b2 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -202,7 +202,6 @@ void guess_time_zone(void) {
 }
 
 
-
 /*
  * Per-room callback function for ingest_old_roominfo_and_roompic_files()
  *
@@ -218,8 +217,6 @@ void iorarf_oneroom(char *roomname, char *infofile, char *picfile)
        long pic_msgnum = 0;
        char subject[SIZ];
 
-       syslog(LOG_DEBUG, "iorarf_oneroom( %s , %s , %s )", roomname, infofile, picfile);
-
        // Test for the presence of a legacy "room info file"
        if (!IsEmptyStr(infofile)) {
                fp = fopen(infofile, "r");
@@ -248,7 +245,7 @@ void iorarf_oneroom(char *roomname, char *infofile, char *picfile)
                        }
                }
                fclose(fp);
-               // unlink(filename);
+               if (info_msgnum > 0) unlink(infofile);
        }
 
        // Test for the presence of a legacy "room picture file" and import it.
@@ -279,7 +276,7 @@ void iorarf_oneroom(char *roomname, char *infofile, char *picfile)
                        }
                }
                fclose(fp);
-               // unlink(filename);
+               if (pic_msgnum > 0) unlink(picfile);
        }
 
        // Now we have the message numbers of our new banner and icon.  Record them in the room record.
@@ -296,7 +293,6 @@ void iorarf_oneroom(char *roomname, char *infofile, char *picfile)
 }
 
 
-
 struct iorarf_list {
        struct iorarf_list *next;
        char name[ROOMNAMELEN];