no enters in raise error messages

This commit is contained in:
Ward Wouts 2002-07-07 19:12:24 +00:00
parent c62d79e1e0
commit 454552669d

View file

@ -156,7 +156,7 @@ def get_group_info(server)
resp, count, first, last, name = @connections[server]["nntp"].group(@group) resp, count, first, last, name = @connections[server]["nntp"].group(@group)
rescue Net::NNTP::RuntimeError rescue Net::NNTP::RuntimeError
print "Got error \"#{$!}\" from #{server}\n" print "Got error \"#{$!}\" from #{server}\n"
raise PermError, "$!" raise PermError, "#{$!}"
rescue Errno::EPIPE, Errno::ECONNRESET rescue Errno::EPIPE, Errno::ECONNRESET
print "Caught Errno::EPIPE reading from server #{server}\n" print "Caught Errno::EPIPE reading from server #{server}\n"
print "Error: #{$!}\n" print "Error: #{$!}\n"
@ -166,7 +166,7 @@ def get_group_info(server)
end end
rescue TimeoutError rescue TimeoutError
timedout += 1 timedout += 1
raise PermError, "Too many timeouts! (get_group_info)\n" if timedout > 1 raise PermError, "Too many timeouts! (get_group_info)" if timedout > 1
print "Time out, reconnecting to server...\n" print "Time out, reconnecting to server...\n"
reconnect(server) reconnect(server)
retry retry
@ -205,7 +205,7 @@ def get_xhdr(server, range, header)
rescue TimeoutError rescue TimeoutError
print "Time out, reconnecting to server\n" print "Time out, reconnecting to server\n"
timedout += 1 timedout += 1
raise PermError, "Too many timeouts! (get_xhrd)\n" if timedout > 1 raise PermError, "Too many timeouts! (get_xhrd)" if timedout > 1
reconnect(server) reconnect(server)
get_group_info(server) get_group_info(server)
retry retry
@ -267,7 +267,7 @@ def get_body(server, message)
rescue TimeoutError rescue TimeoutError
print "Time out, reconnecting to server\n" print "Time out, reconnecting to server\n"
timedout += 1 timedout += 1
raise PermError, "Too many timeouts! (get_body)\n" if timedout > 1 raise PermError, "Too many timeouts! (get_body)" if timedout > 1
reconnect(server) reconnect(server)
get_group_info(server) get_group_info(server)
retry retry
@ -296,7 +296,7 @@ def get_group_body(subj)
i += 1 i += 1
retry retry
else else
raise TempError, "Message-id not on another server\n" raise TempError, "Message-id not on another server"
end end
end end
end end
@ -327,7 +327,7 @@ def get_group_body_first(subj)
i += 1 i += 1
retry retry
else else
raise TempError, "Message-id not on another server\n" raise TempError, "Message-id not on another server"
end end
end end
end end
@ -357,7 +357,7 @@ def get_group_body_rest(subj, file=nil)
i += 1 i += 1
retry retry
else else
raise TempError, "Message-id not on another server\n" raise TempError, "Message-id not on another server"
end end
end end
end end
@ -785,7 +785,7 @@ def _ydecode_file(file, outfile)
if b.to_i == oldpartend + 1 if b.to_i == oldpartend + 1
oldpartend = e.to_i oldpartend = e.to_i
else else
raise PermError, "Parts not continuous! last end #{oldpartend}, begin #{b}\n" raise PermError, "Parts not continuous! last end #{oldpartend}, begin #{b}"
end end
next next
end end