~ubuntu-branches/ubuntu/wily/libtorrent/wily-proposed

« back to all changes in this revision

Viewing changes to debian/patches/spelling-fixes

  • Committer: Bazaar Package Importer
  • Author(s): Rogério Brito
  • Date: 2011-03-20 01:06:18 UTC
  • mfrom: (1.1.13 upstream) (4.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110320010618-g3wyylccqzqko73c
Tags: 0.12.7-5
* Use Steinar's "real" patch for IPv6. Addresses #490277, #618275,
  and Closes: #617791.
* Adapt libtorrent-0.12.6-ipv6-07.patch. It FTBFS otherwise.
* Add proper attibution to the IPv6 patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
--- a/src/download/download_constructor.cc
 
2
+++ b/src/download/download_constructor.cc
 
3
@@ -337,7 +337,7 @@
 
4
     throw input_error("Bad torrent file, \"path\" has zero entries.");
 
5
 
 
6
   if (std::find_if(plist.begin(), plist.end(), std::ptr_fun(&DownloadConstructor::is_invalid_path_element)) != plist.end())
 
7
-    throw input_error("Bad torrent file, \"path\" has zero entries or a zero lenght entry.");
 
8
+    throw input_error("Bad torrent file, \"path\" has zero entries or a zero length entry.");
 
9
 
 
10
   Path p;
 
11
   p.set_encoding(enc);
 
12
--- a/src/protocol/peer_connection_base.cc
 
13
+++ b/src/protocol/peer_connection_base.cc
 
14
@@ -585,7 +585,7 @@
 
15
   }
 
16
 
 
17
   if (!transfer->block()->is_transfering())
 
18
-    throw internal_error("PeerConnectionBase::down_chunk_skip_process(...) block is not transfering, yet we have non-leaders.");
 
19
+    throw internal_error("PeerConnectionBase::down_chunk_skip_process(...) block is not transferring, yet we have non-leaders.");
 
20
 
 
21
   // Temporary test.
 
22
   if (transfer->position() > transfer->block()->leader()->position())