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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/06/17 01:21:46

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonShared.ml 
        src/networks/donkey: donkeyGlobals.ml donkeyMain.ml 

Log message:
        patch #5995

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1276&r2=1.1277
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonShared.ml?cvsroot=mldonkey&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyGlobals.ml?cvsroot=mldonkey&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyMain.ml?cvsroot=mldonkey&r1=1.69&r2=1.70

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1276
retrieving revision 1.1277
diff -u -b -r1.1276 -r1.1277
--- distrib/ChangeLog   17 Jun 2007 01:20:19 -0000      1.1276
+++ distrib/ChangeLog   17 Jun 2007 01:21:45 -0000      1.1277
@@ -15,6 +15,7 @@
 =========
 
 2007/06/17
+5995: EDK: Better handle permission denied errors for shared/downloading files
 5992: BT/IP block: Fix country-based IP blocking
 -------------------------------------------------------------------------------
 2007/06/03: version 2.8.7 = tag release-2-8-7

Index: src/daemon/common/commonShared.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonShared.ml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- src/daemon/common/commonShared.ml   6 Feb 2007 22:26:58 -0000       1.39
+++ src/daemon/common/commonShared.ml   17 Jun 2007 01:21:45 -0000      1.40
@@ -307,8 +307,7 @@
                   new_shared dirname shared_dir.shdir_priority
                     local_name full_name
               with e -> 
-                  lprintf_nl "%s will not be shared (exception %s)"
-                    full_name (Printexc2.to_string e);
+                  lprintf_nl "Share error: %s" (Printexc2.to_string e);
             with _ -> ()
       ) files
     with e -> 

Index: src/networks/donkey/donkeyGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- src/networks/donkey/donkeyGlobals.ml        31 May 2007 19:24:58 -0000      
1.119
+++ src/networks/donkey/donkeyGlobals.ml        17 Jun 2007 01:21:45 -0000      
1.120
@@ -376,7 +376,10 @@
           Unix32.create_sparsefile file_diskname writable
         else
 *)
+          try
           Unix32.create_diskfile file_diskname writable
+          with e ->
+            failwith (Printf.sprintf "Error: %s" (Printexc2.to_string e))
       in
       let file_size =
         if file_size = Int64.zero then

Index: src/networks/donkey/donkeyMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyMain.ml,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- src/networks/donkey/donkeyMain.ml   19 Apr 2007 13:34:07 -0000      1.69
+++ src/networks/donkey/donkeyMain.ml   17 Jun 2007 01:21:45 -0000      1.70
@@ -263,12 +263,15 @@
 be useful when users want to share files that they had already previously
   shared *)
           let key = (file.sh_name, file.sh_size, file.sh_mtime) in
+          (try
           if Unix32.file_exists file.sh_name &&
             not (Hashtbl.mem shared_files_info key) 
             then begin
               Hashtbl.add shared_files_info key file;
               list := file :: !list
             end
+          with e ->
+            lprintf_nl "ignoring share: %s" (Printexc2.to_string e))
       ) !!known_shared_files;
       known_shared_files =:= !list;