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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/04/05 00:16:29

Modified files:
        distrib        : ChangeLog 
        src/daemon/chat: chat_options.ml 
        src/utils/lib  : options.ml4 

Log message:
        patch #5015

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.785&tr2=1.786&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/chat/chat_options.ml.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/options.ml4.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.785 mldonkey/distrib/ChangeLog:1.786
--- mldonkey/distrib/ChangeLog:1.785    Mon Apr  3 21:37:47 2006
+++ mldonkey/distrib/ChangeLog  Wed Apr  5 00:16:28 2006
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/04/05
+5015: Fix option file saving bug introduced in tryopen patch
+
 2006/04/03
 5011: EDK: Update server info received by UDP when
       update_server_list_server false (pango)
Index: mldonkey/src/daemon/chat/chat_options.ml
diff -u mldonkey/src/daemon/chat/chat_options.ml:1.3 
mldonkey/src/daemon/chat/chat_options.ml:1.4
--- mldonkey/src/daemon/chat/chat_options.ml:1.3        Mon Apr  3 20:50:08 2006
+++ mldonkey/src/daemon/chat/chat_options.ml    Wed Apr  5 00:16:29 2006
@@ -589,10 +589,8 @@
             _ -> ())
       opfile.file_rc;
   end);
-  try 
-    Sys.rename filename old_file;
-    Sys.rename temp_file filename
-  with _ -> ();
+  (try Sys.rename filename old_file with _ -> ());
+  (try Sys.rename temp_file filename with _ -> ())
 ;;
 
 let save_with_help opfile =
Index: mldonkey/src/utils/lib/options.ml4
diff -u mldonkey/src/utils/lib/options.ml4:1.18 
mldonkey/src/utils/lib/options.ml4:1.19
--- mldonkey/src/utils/lib/options.ml4:1.18     Mon Apr  3 20:50:09 2006
+++ mldonkey/src/utils/lib/options.ml4  Wed Apr  5 00:16:29 2006
@@ -906,10 +906,8 @@
           opfile.file_rc <- !rem
        end;
       Hashtbl.clear once_values_rev);
-    (try 
-      Unix2.rename filename old_file;
-      Unix2.rename temp_file filename 
-    with _ -> ());
+    begin try Unix2.rename filename old_file with  _ -> () end;
+    begin try Unix2.rename temp_file filename with _ -> () end;
     opfile.file_after_save_hook ();
   with e -> 
     opfile.file_after_save_hook ();