aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-05 08:08:06 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-05 08:08:06 +0000
commit4710dd15f88e2baf62ccff5890a9047de597523e (patch)
tree61d9126934691bd57632cb545d0cf7b79e165ddc
parent1156598c55fbf09a5ee96c0795d2224248913807 (diff)
downloadpaludis-4710dd15f88e2baf62ccff5890a9047de597523e.tar.gz
paludis-4710dd15f88e2baf62ccff5890a9047de597523e.tar.xz
Fix lists url
-rw-r--r--doc/index.html.skel4
-rw-r--r--src/clients/paludis/install.cc38
2 files changed, 29 insertions, 13 deletions
diff --git a/doc/index.html.skel b/doc/index.html.skel
index 650e2c2..46748d4 100644
--- a/doc/index.html.skel
+++ b/doc/index.html.skel
@@ -42,7 +42,7 @@
<li><strong>Support</strong> is available via <code>#paludis</code> on
<code>irc.freenode.net</code> or the <a
- href="lists.html">mailing lists</a>.</li>
+ href="https://developer.berlios.de/mail/?group_id=6360">mailing lists</a>.</li>
</ul>
<h2>For developers:</h2>
@@ -66,7 +66,7 @@
<li><strong>Development questions</strong> should be asked in <code>#paludis</code> on
<code>irc.freenode.net</code> or on the <a
- href="lists.html">mailing lists</a>.</li>
+ href="https://developer.berlios.de/mail/?group_id=6360">mailing lists</a>.</li>
</ul>
diff --git a/src/clients/paludis/install.cc b/src/clients/paludis/install.cc
index 0583e05..42bdb04 100644
--- a/src/clients/paludis/install.cc
+++ b/src/clients/paludis/install.cc
@@ -239,17 +239,33 @@ namespace
void
InstallKilledCatcher::_signal_handler(int sig)
{
- 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);
+ 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);
+ }
}
DepListDepsOption