summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-09-03 17:50:53 -0700
committerZac Medico <zmedico@gentoo.org>2010-09-03 17:50:53 -0700
commit13c90823a8e7c4a8fe33d79f34693e642dd8aa81 (patch)
tree95dcda4113520c59f44e12648d013e25854eced6
parent41a90f125ab5475d3c3afd78b1cedfa1e8b85062 (diff)
downloadportage-13c90823a8e7c4a8fe33d79f34693e642dd8aa81.tar.gz
portage-13c90823a8e7c4a8fe33d79f34693e642dd8aa81.tar.bz2
portage-13c90823a8e7c4a8fe33d79f34693e642dd8aa81.zip
Move AlarmSignal.unregister() call to a better place in action_sync().
-rw-r--r--pym/_emerge/actions.py5
1 files changed, 3 insertions, 2 deletions
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: