From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 4 Sep 2010 00:50:53 +0000 (-0700)
Subject: Move AlarmSignal.unregister() call to a better place in action_sync().
X-Git-Tag: v2.2_rc75~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=13c90823a8e7c4a8fe33d79f34693e642dd8aa81;p=portage.git

Move AlarmSignal.unregister() call to a better place in action_sync().
---

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 0da1d685b..294d9a9d0 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2142,8 +2142,6 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 								uid=os.getuid())
 						content = portage.grabfile(tmpservertimestampfile)
 					finally:
-						if rsync_initial_timeout:
-							portage.exception.AlarmSignal.unregister()
 						try:
 							os.unlink(tmpservertimestampfile)
 						except OSError:
@@ -2156,6 +2154,9 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 						os.waitpid(mypids[0], 0)
 					# This is the same code rsync uses for timeout.
 					exitcode = 30
+				finally:
+					if rsync_initial_timeout:
+						portage.exception.AlarmSignal.unregister()
 				else:
 					if exitcode != os.EX_OK:
 						if exitcode & 0xff: