diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2007-11-22 23:38:52 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2007-11-22 23:38:52 +0000 |
| commit | 8607cd89fd8db5edb0392844c9254ec2467de9f2 (patch) | |
| tree | ef9239ba455e48061015ce66d00f06ef1b9a40e1 /net-nntp/hellanzb/files | |
| parent | Stable on amd64 wrt bug #200033 (diff) | |
| download | gentoo-2-8607cd89fd8db5edb0392844c9254ec2467de9f2.tar.gz gentoo-2-8607cd89fd8db5edb0392844c9254ec2467de9f2.tar.bz2 gentoo-2-8607cd89fd8db5edb0392844c9254ec2467de9f2.zip | |
patch update to avoid a crash when the host in unreachable, thanks again to tonfa
(Portage version: 2.1.3.19)
Diffstat (limited to 'net-nntp/hellanzb/files')
| -rw-r--r-- | net-nntp/hellanzb/files/digest-hellanzb-0.13-r3 (renamed from net-nntp/hellanzb/files/digest-hellanzb-0.13-r2) | 0 | ||||
| -rw-r--r-- | net-nntp/hellanzb/files/hellanzb-0.13-fix_multiples_hosts.diff | 30 |
2 files changed, 28 insertions, 2 deletions
diff --git a/net-nntp/hellanzb/files/digest-hellanzb-0.13-r2 b/net-nntp/hellanzb/files/digest-hellanzb-0.13-r3 index 49b039d674c3..49b039d674c3 100644 --- a/net-nntp/hellanzb/files/digest-hellanzb-0.13-r2 +++ b/net-nntp/hellanzb/files/digest-hellanzb-0.13-r3 diff --git a/net-nntp/hellanzb/files/hellanzb-0.13-fix_multiples_hosts.diff b/net-nntp/hellanzb/files/hellanzb-0.13-fix_multiples_hosts.diff index 695c62ce3bc4..5cf39c311a82 100644 --- a/net-nntp/hellanzb/files/hellanzb-0.13-fix_multiples_hosts.diff +++ b/net-nntp/hellanzb/files/hellanzb-0.13-fix_multiples_hosts.diff @@ -1,6 +1,6 @@ diff -r bdbcba80e0fa Hellanzb/NZBLeecher/Protocol.py --- a/Hellanzb/NZBLeecher/Protocol.py Wed Nov 14 10:00:29 2007 +0100 -+++ b/Hellanzb/NZBLeecher/Protocol.py Wed Nov 14 10:01:07 2007 +0100 ++++ b/Hellanzb/NZBLeecher/Protocol.py Thu Nov 22 22:32:04 2007 +0100 @@ -27,18 +27,14 @@ PHI = 1.6180339887498948 # (1 + math.sqr PHI = 1.6180339887498948 # (1 + math.sqrt(5)) / 2 class NZBLeecherFactory(ReconnectingClientFactory): @@ -21,9 +21,35 @@ diff -r bdbcba80e0fa Hellanzb/NZBLeecher/Protocol.py # statistics for the current session (sessions end when downloading stops on all # clients). sessionReadBytes and sessionStartime are used to calculate the average +@@ -88,6 +84,7 @@ class NZBLeecherFactory(ReconnectingClie + p.factory = self + p.id = self.clientIds[0] + self.clientIds.remove(p.id) ++ p.host, p.port = addr.host, addr.port + + # All clients inherit the factory's anti idle timeout setting + # FIXME: I don't think there's any reason to copy these values to the +@@ -323,7 +320,7 @@ class NZBLeecher(NNTPClient, TimeoutMixi + "Override for notification when authInfoFailed() action fails" + debug(str(self) + ' AUTHINFO failed: ' + str(err)) + # FIXME: This gives us too much scroll. Need to only do it selectively +- #error(self.factory.hostname + '[' + str(self.id).zfill(2) + '] Authorization failed: ' + str(err)) ++ #error(self.host + '[' + str(self.id).zfill(2) + '] Authorization failed: ' + str(err)) + self.transport.loseConnection() + + def connectionMade(self): +@@ -428,7 +425,7 @@ class NZBLeecher(NNTPClient, TimeoutMixi + login """ + if self.username == None and self.password == None: + warn('Could not MODE READER on no auth server (%s:%i), returned: %s' % \ +- (self.factory.host, self.factory.port, str(err))) ++ (self.host, self.port, str(err))) + reactor.callLater(0, self.fetchNextNZBSegment) + elif not self.isLoggedIn: + self.setReaderAfterLogin = True diff -r bdbcba80e0fa Hellanzb/NZBLeecher/__init__.py --- a/Hellanzb/NZBLeecher/__init__.py Wed Nov 14 10:00:29 2007 +0100 -+++ b/Hellanzb/NZBLeecher/__init__.py Wed Nov 14 10:01:07 2007 +0100 ++++ b/Hellanzb/NZBLeecher/__init__.py Thu Nov 22 22:32:04 2007 +0100 @@ -122,30 +122,28 @@ def connectServer(serverName, serverDict connectionCount = 0 hosts = serverDict['hosts'] |