diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-17 15:19:20 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-17 15:19:20 -0700 |
| commit | a9df8e0f5d49921974ed360a1277f14168aa5101 (patch) | |
| tree | 0106c89e942dac9fedcc1c4360533a0d6cf5811e /pym/_emerge/AsynchronousLock.py | |
| parent | 927966f77a5a9b94462e9a0c23be4e7b56207f58 (diff) | |
| download | portage-a9df8e0f5d49921974ed360a1277f14168aa5101.tar.gz portage-a9df8e0f5d49921974ed360a1277f14168aa5101.tar.bz2 portage-a9df8e0f5d49921974ed360a1277f14168aa5101.zip | |
test_asynchronous_lock: simulate SIGINT from tty
Diffstat (limited to 'pym/_emerge/AsynchronousLock.py')
| -rw-r--r-- | pym/_emerge/AsynchronousLock.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py index 86b102b8b..3e7600f17 100644 --- a/pym/_emerge/AsynchronousLock.py +++ b/pym/_emerge/AsynchronousLock.py @@ -184,7 +184,7 @@ class _LockProcess(AbstractPollTask): """ __slots__ = ('path', 'scheduler',) + \ - ('_acquired', '_proc', '_files', '_reg_id', '_unlocked') + ('_acquired', '_kill_test', '_proc', '_files', '_reg_id', '_unlocked') def _start(self): in_pr, in_pw = os.pipe() @@ -216,7 +216,7 @@ class _LockProcess(AbstractPollTask): # If the lock hasn't been aquired yet, the # caller can check the returncode and handle # this failure appropriately. - if not self.cancelled: + if not (self.cancelled or self._kill_test): writemsg_level("_LockProcess: %s\n" % \ _("failed to acquire lock on '%s'") % (self.path,), level=logging.ERROR, noiselevel=-1) |