From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 31 Dec 2010 08:51:24 +0000 (-0800)
Subject: bintree: add timeout for closing binhost conn
X-Git-Tag: v2.2.0_alpha11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=514bcc3aeea4d6086c270ad97599bd539b9e6ad0;p=portage.git

bintree: add timeout for closing binhost conn

Hopefully this solves bug #350139.
---

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index d1c1e2a4b..68d6845db 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -23,7 +23,7 @@ from portage.cache.mappings import slot_dict_class
 from portage.const import CACHE_PATH
 from portage.dbapi.virtual import fakedbapi
 from portage.dep import Atom, use_reduce, paren_enclose
-from portage.exception import InvalidPackageName, \
+from portage.exception import AlarmSignal, InvalidPackageName, \
 	PermissionDenied, PortageException
 from portage.localization import _
 from portage import _movefile
@@ -806,7 +806,18 @@ class binarytree(object):
 							rmt_idx.readBody(f_dec)
 							pkgindex = rmt_idx
 				finally:
-					f.close()
+					# Timeout after 5 seconds, in case close() blocks
+					# indefinitely (see bug #350139).
+					try:
+						try:
+							AlarmSignal.register(5)
+							f.close()
+						finally:
+							AlarmSignal.unregister()
+					except AlarmSignal:
+						writemsg("\n\n!!! %s\n" % \
+							_("Timed out while closing connection to binhost"),
+							noiselevel=-1)
 			except EnvironmentError as e:
 				writemsg(_("\n\n!!! Error fetching binhost package" \
 					" info from '%s'\n") % base_url)