From 13c90823a8e7c4a8fe33d79f34693e642dd8aa81 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 3 Sep 2010 17:50:53 -0700 Subject: Move AlarmSignal.unregister() call to a better place in action_sync(). --- pym/_emerge/actions.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pym/_emerge') 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: -- cgit v1.2.3-1-g7c22