[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/10/17 18:25:02

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyInteractive.ml 

Log message:
        patch #6237

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1325&r2=1.1326
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.163&r2=1.164

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1325
retrieving revision 1.1326
diff -u -b -r1.1325 -r1.1326
--- distrib/ChangeLog   10 Oct 2007 21:50:32 -0000      1.1325
+++ distrib/ChangeLog   17 Oct 2007 18:25:02 -0000      1.1326
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2007/10/17
+6237: EDK: Load server.met files from archives even if unpack fails
+- http://www.gruk.org/server.met.gz is not a gz archive at the moment...
+
 2007/10/10
 6231: Swarming: Propagate chunks of finished file before commit (pango)
       to other downloading files

Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- src/networks/donkey/donkeyInteractive.ml    31 Aug 2007 19:40:06 -0000      
1.163
+++ src/networks/donkey/donkeyInteractive.ml    17 Oct 2007 18:25:02 -0000      
1.164
@@ -187,7 +187,9 @@
                (Printexc2.to_string e) url;
              raise e);
            result
-         with e ->
+         with
+          | Zip.Error _ -> filename
+          | e ->
             lprintf_nl "Exception %s while opening %s"
              (Printexc2.to_string e) url;
             raise Not_found)
@@ -196,7 +198,9 @@
          if ext = ".bz2" || ext = ".met.bz2" then "bz2" else "gz" in 
        try
           Misc.archive_extract filename filetype
-       with e ->
+       with
+        | Gzip.Error _ -> filename
+        | e ->
           lprintf_nl "Exception %s while extracting from %s"
            (Printexc2.to_string e) url;
           raise Not_found)