[Mldonkey-commits] Changes to mldonkey/src/utils/net/ip_set.ml

[mldonkey-commits]

Index: mldonkey/src/utils/net/ip_set.ml
diff -u mldonkey/src/utils/net/ip_set.ml:1.10 
mldonkey/src/utils/net/ip_set.ml:1.11
--- mldonkey/src/utils/net/ip_set.ml:1.10       Sat Jul 23 14:19:48 2005
+++ mldonkey/src/utils/net/ip_set.ml    Tue Jul 26 21:22:49 2005
@@ -131,9 +131,18 @@
                 let s = Misc.archive_extract filename "zip" in
                 load_merge bl_empty file.Zip.filename true
               with e ->
-                lprintf_nl () "Exception %s while extracting guarding.p2p from 
%s"
-                  (Printexc2.to_string e) filename;
-                  bl_empty
+                begin
+                  try
+                    let file = Zip.find_entry (Zip.open_in filename) 
"guarding_full.p2p" in
+                      lprintf_nl () "guarding_full.p2p found in zip file";
+                      let s = Misc.archive_extract filename "zip" in
+                      load_merge bl_empty file.Zip.filename true
+                    with e ->
+                      lprintf_nl () "Exception %s while extracting 
guarding.p2p/guarding_full.p2p from %s"
+                        (Printexc2.to_string e) filename;
+                      lprintf_nl () "One of the mentioned files has to be 
present in the zip file";
+                      bl_empty
+                end
           end
        | ".bz2" | ".p2p.bz2" | ".gz" | ".p2p.gz" ->
           begin