aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-05 08:09:15 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-05 08:09:15 +0000
commit329adfb4ec54e4d580c5d9e7a80599f0e2d5a6b2 (patch)
treef35d14a5be0a2bc9240fbd75700776415dcaf48e
parent4710dd15f88e2baf62ccff5890a9047de597523e (diff)
downloadpaludis-329adfb4ec54e4d580c5d9e7a80599f0e2d5a6b2.tar.gz
paludis-329adfb4ec54e4d580c5d9e7a80599f0e2d5a6b2.tar.xz
That wasn't supposed to be part of that commit
-rw-r--r--src/clients/paludis/install.cc38
1 files changed, 11 insertions, 27 deletions
diff --git a/src/clients/paludis/install.cc b/src/clients/paludis/install.cc
index 42bdb04..0583e05 100644
--- a/src/clients/paludis/install.cc
+++ b/src/clients/paludis/install.cc
@@ -239,33 +239,17 @@ namespace
void
InstallKilledCatcher::_signal_handler(int sig)
{
- static bool recursing(false);
-
- if (recursing)
- {
- cout << endl;
- cerr << "Caught signal " << sig << " inside signal" << endl;
- cerr << "NOT waiting for children any more..." << endl;
- cerr << endl;
- cerr << "Exiting with failure" << endl;
- exit(EXIT_FAILURE);
- }
- else
- {
- recursing = true;
-
- cout << endl;
- cerr << "Caught signal " << sig << endl;
- cerr << "Waiting for children..." << endl;
- while (-1 != wait(0))
- ;
- cerr << endl;
- if (_task)
- show_resume_command(*_task);
- cerr << endl;
- cerr << "Exiting with failure" << endl;
- exit(EXIT_FAILURE);
- }
+ cout << endl;
+ cerr << "Caught signal " << sig << endl;
+ cerr << "Waiting for children..." << endl;
+ while (-1 != wait(0))
+ ;
+ cerr << endl;
+ if (_task)
+ show_resume_command(*_task);
+ cerr << endl;
+ cerr << "Exiting with failure" << endl;
+ exit(EXIT_FAILURE);
}
DepListDepsOption