[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:26:02

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

Log message:
        patch #6019

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1279&r2=1.1280
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonComplexOptions.ml?cvsroot=mldonkey&r1=1.75&r2=1.76

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1279
retrieving revision 1.1280
diff -u -b -r1.1279 -r1.1280
--- distrib/ChangeLog   17 Jun 2007 01:25:10 -0000      1.1279
+++ distrib/ChangeLog   17 Jun 2007 01:26:02 -0000      1.1280
@@ -15,6 +15,7 @@
 =========
 
 2007/06/17
+6019: BT: Disable user_commit_dir for multifile torrents to fix seeding
 6011: BT: Send no_peer_id to trackers to save some bandwidth (berni)
 6010: Update syslog.ml to version 1.4
 5995: EDK: Better handle permission denied errors for shared/downloading files

Index: src/daemon/common/commonComplexOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonComplexOptions.ml,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- src/daemon/common/commonComplexOptions.ml   31 May 2007 20:42:57 -0000      
1.75
+++ src/daemon/common/commonComplexOptions.ml   17 Jun 2007 01:26:02 -0000      
1.76
@@ -956,18 +956,17 @@
 
 let incoming_dir usedir ?user ?needed_space ?network () =
 
-  let directories =
-    if usedir then
-      search_incoming_directories ()
-    else
-      search_incoming_files ()
-  in
-
+  let directories, dirname_user =
   let dirname_user =
     match user with
     | None -> ""
     | Some user -> user.user_commit_dir
   in
+    if usedir then
+      search_incoming_directories (), ""
+    else
+      search_incoming_files (), dirname_user
+  in
 
 (*
   let dirname_network =