[Mldonkey-commits] mldonkey/src networks/bittorrent/bTInteractive....

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/03/08 18:49:58

Modified files:
        src/networks/bittorrent: bTInteractive.ml 
        src/utils/cdk  : unix2.ml 

Log message:
        patch #4960

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml.diff?tr1=1.84&tr2=1.85&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/cdk/unix2.ml.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: mldonkey/src/networks/bittorrent/bTInteractive.ml
diff -u mldonkey/src/networks/bittorrent/bTInteractive.ml:1.84 
mldonkey/src/networks/bittorrent/bTInteractive.ml:1.85
--- mldonkey/src/networks/bittorrent/bTInteractive.ml:1.84      Sun Mar  5 
10:43:47 2006
+++ mldonkey/src/networks/bittorrent/bTInteractive.ml   Wed Mar  8 18:49:58 2006
@@ -606,6 +606,7 @@
   let filenames = Unix2.list_directory new_torrents_directory in
   List.iter (fun file ->
     let file = Filename.concat new_torrents_directory file in
+    if not (Unix2.is_directory file) then
     try
       load_torrent_file file;
       (try Sys.remove file with _ -> ())
Index: mldonkey/src/utils/cdk/unix2.ml
diff -u mldonkey/src/utils/cdk/unix2.ml:1.23 
mldonkey/src/utils/cdk/unix2.ml:1.24
--- mldonkey/src/utils/cdk/unix2.ml:1.23        Sat Feb  4 22:26:36 2006
+++ mldonkey/src/utils/cdk/unix2.ml     Wed Mar  8 18:49:58 2006
@@ -26,7 +26,8 @@
   try
     while true do
       let file = readdir dir in 
-      if file <> "." && file <> ".." then begin
+      if file <> "." && file <> ".." &&
+       not (file = ".DS_Store" && Autoconf.system = "macosx") then begin
           list := file :: !list 
         end;
     done;