summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Resch <andrewresch@gmail.com>2009-01-06 12:50:49 +0000
committerAndrew Resch <andrewresch@gmail.com>2009-01-06 12:50:49 +0000
commit8deee640070524a7f18c6747b649c0e8f23d7018 (patch)
tree46af1a0dd0ea87c9fc81b3915784f087a2cb8e79
parent42cceabd8ea5ef9c59be33eecb87a0697a6a5e9d (diff)
downloaddeluge-8deee640070524a7f18c6747b649c0e8f23d7018.tar.gz
deluge-8deee640070524a7f18c6747b649c0e8f23d7018.tar.bz2
deluge-8deee640070524a7f18c6747b649c0e8f23d7018.zip
Fix issue in get_tracker_host when the torrent has no tracker
-rw-r--r--ChangeLog4
-rw-r--r--deluge/core/torrent.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b3d3a5c4f..dce8195f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Deluge 1.1.0_RC4 (In Development)
+ Core:
+ * Fix issue in get_tracker_host when the torrent has no tracker
+
Deluge 1.1.0_RC3 (05 January 2009)
Core:
* Fix applying proxy settings
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 8d2d219ec..7b7ceb872 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -522,7 +522,7 @@ class Torrent:
# Check if hostname is an IP address and just return it if that's the case
import socket
try:
- socket.inet_aton(url.hostname)
+ socket.inet_aton(host)
except socket.error:
pass
else: