[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/19 23:02:18

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyServers.ml 

Log message:
        patch #5563

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1099&r2=1.1100
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyServers.ml?cvsroot=mldonkey&r1=1.64&r2=1.65

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1099
retrieving revision 1.1100
diff -u -b -r1.1099 -r1.1100
--- distrib/ChangeLog   15 Nov 2006 12:39:06 -0000      1.1099
+++ distrib/ChangeLog   19 Nov 2006 23:02:18 -0000      1.1100
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/11/20
+5563: EDK: Fix broken log message when master server changes (Schlumpf)
+
 2006/11/15
 5556: web_infos: new option rss_preprocessor used for fixing broken RSS feeds,
       safer process spawning for command "!" (pango)

Index: src/networks/donkey/donkeyServers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- src/networks/donkey/donkeyServers.ml        15 Nov 2006 12:34:30 -0000      
1.64
+++ src/networks/donkey/donkeyServers.ml        19 Nov 2006 23:02:18 -0000      
1.65
@@ -213,13 +213,18 @@
 let disconnect_server s reason =
   let choose_new_master_server s =
     match !DonkeyGlobals.master_server with
-      Some ss when s == ss ->
+    | Some ss when s == ss ->
        DonkeyGlobals.master_server := None;
         (try
          DonkeyGlobals.master_server :=
            Some (List.find (fun s -> s.server_master) !servers_list);
-         lprintf_nl "changed main master server from %s to %s"
-           (string_of_server ss) (string_of_server s)
+         if !verbose_location then begin
+            match !DonkeyGlobals.master_server with
+            | Some ns -> 
+                   lprintf_nl "changed main master server from %s (%s) to %s 
(%s)"
+                     ss.server_name (string_of_server ss) ns.server_name 
(string_of_server ns)
+            | _ -> ()
+          end
         with Not_found -> ())
     | _ -> ();
   in