[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.0-3-6-g803afae

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 803afae6d0fd76cb4fefd5def9966d5ee6d188ce
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Nov 1 21:49:40 2009 +0100

    Fix torrent parsing when announce-list is empty (Closes: #552004)

diff --git a/debian/changelog b/debian/changelog
index da36664..aa77987 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mldonkey (3.0.0-4) unstable; urgency=low
   * Pass "--iosched idle" to start-stop-daemon (Closes: #549498)
   * Rotate the log files found in /var/log/mldonkey/ (Closes: #539726)
   * Fix download of torrent files with no 'announce' field (Closes: #551896)
+  * Fix torrent parsing when announce-list is empty (Closes: #552004)
 
  -- Mehdi Dogguy <mehdi at debian.org>  Sun, 01 Nov 2009 20:59:25 +0100
 
diff --git a/debian/patches/no-announce.dpatch b/debian/patches/no-announce.dpatch
index 9d42b15..9c19cd8 100755
--- a/debian/patches/no-announce.dpatch
+++ b/debian/patches/no-announce.dpatch
@@ -3,11 +3,21 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Fix download of torrent files with no 'announce' field
+## DP: and fix torrent parsing when announce-list is empty
 
 @DPATCH@
 diff -urNad mldonkey~/src/networks/bittorrent/bTTorrent.ml mldonkey/src/networks/bittorrent/bTTorrent.ml
 --- mldonkey~/src/networks/bittorrent/bTTorrent.ml	2009-11-01 19:08:52.000000000 +0100
-+++ mldonkey/src/networks/bittorrent/bTTorrent.ml	2009-11-01 21:44:23.000000000 +0100
++++ mldonkey/src/networks/bittorrent/bTTorrent.ml	2009-11-01 21:48:56.000000000 +0100
+@@ -169,7 +169,7 @@
+                             announce_list := !next_urls @ !announce_list
+                           end
+                         else
+-                          announce_list := List.hd !next_urls :: !announce_list
++                          announce_list := (try List.hd !next_urls with _ -> "") :: !announce_list
+                     | _ ->
+                         lprintf_nl "[BT] unknown field in announce list"
+                     ) list;
 @@ -285,7 +285,6 @@
      | None -> Charset.safe_convert !file_encoding !file_name
      | Some name -> name

-- 
mldonkey packaging