[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/02 12:56:53

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml 

Log message:
        patch #5297

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1037&r2=1.1038
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.179&r2=1.180

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1037
retrieving revision 1.1038
diff -u -b -r1.1037 -r1.1038
--- distrib/ChangeLog   2 Oct 2006 00:28:19 -0000       1.1037
+++ distrib/ChangeLog   2 Oct 2006 12:56:53 -0000       1.1038
@@ -15,6 +15,9 @@
 =========
 
 2006/10/02
+5297: In addition to previous patch 5297 force conversion of allowed_ips to
+      IP blocklist when $MLDONKEY_DIR points to an existing directory
+      and ini files are created for the first time
 5429: Fix compile bug in Ocaml 3.08.3 (thx to eike for reporting)
 
 2006/10/01

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -b -r1.179 -r1.180
--- src/daemon/common/commonOptions.ml  25 Sep 2006 21:37:14 -0000      1.179
+++ src/daemon/common/commonOptions.ml  2 Oct 2006 12:56:53 -0000       1.180
@@ -145,7 +145,8 @@
   end;
 
   lprintf_nl "MLDonkey is working in %s" file_basedir;
-  if not (Sys.file_exists file_basedir) then begin
+  if not (Sys.file_exists file_basedir) ||
+        not (Sys.file_exists (Filename.concat file_basedir "downloads.ini")) 
then begin
     lprint_newline ();
     lprintf_nl "creating new MLDonkey base directory in %s\n" file_basedir;
     created_new_base_directory := Some file_basedir