Make AlarmSignal.register() require a time parameter and pass it to

signal.alarm().

diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py
index b3d28a789a1c2c5f760006d692d6ad7da3e27863..baa7abb4cbe5f76be5b0845315aca93295e33ea7 100755 (executable)
--- a/bin/ebuild-ipc.py
+++ b/bin/ebuild-ipc.py
@@ -49,8 +49,8 @@ class EbuildIpc(object):
                start_time = time.time()
 
                try:
-                       portage.exception.AlarmSignal.register()
-                       signal.alarm(self._COMMUNICATE_TIMEOUT_SECONDS)
+                       portage.exception.AlarmSignal.register(
+                               self._COMMUNICATE_TIMEOUT_SECONDS)
                        returncode = self._communicate(args)
                        return returncode
                except portage.exception.AlarmSignal:

diff --git a/pym/portage/exception.py b/pym/portage/exception.py
index dca1100e6e9e82a9f6c8ca0f2aea7de4a95fdac4..ae655542a76eb05a97a862712e9acf6c89fae27d 100644 (file)
--- a/pym/portage/exception.py
+++ b/pym/portage/exception.py
@@ -91,8 +91,9 @@ class AlarmSignal(TimeoutException):
                self.frame = frame
 
        @classmethod
-       def register(cls):
+       def register(cls, time):
                signal.signal(signal.SIGALRM, cls._signal_handler)
+               signal.alarm(time)
 
        @classmethod
        def unregister(cls):