aboutsummaryrefslogtreecommitdiff
path: root/bbot/machine.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-05-12 16:11:48 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-05-12 16:11:48 +0200
commit73546642ff887b0a887d00ac43395afde99577b3 (patch)
treece090031b6b1b19185f4dbed897e513adc6b0c9d /bbot/machine.cxx
parentea9063805ce849d2ef81396e53aa1437a520fe5e (diff)
Do soft/hard fail properly
Diffstat (limited to 'bbot/machine.cxx')
-rw-r--r--bbot/machine.cxx10
1 files changed, 2 insertions, 8 deletions
diff --git a/bbot/machine.cxx b/bbot/machine.cxx
index 2f1e56b..8bc6359 100644
--- a/bbot/machine.cxx
+++ b/bbot/machine.cxx
@@ -383,11 +383,8 @@ namespace bbot
}
catch (const process_error& e)
{
- diag_record dr; if (fh) dr << fail; else dr << error;
- dr << "unable to execute " << kvm << ": " << e;
+ fail (fh) << "unable to execute " << kvm << ": " << e << endf;
}
-
- throw failed ();
}
void kvm_machine::
@@ -453,11 +450,8 @@ namespace bbot
}
catch (const system_error& e)
{
- diag_record dr; if (fh) dr << fail; else dr << error;
- dr << "unable to communicate with qemu monitor: " << e;
+ fail (fh) << "unable to communicate with qemu monitor: " << e;
}
-
- throw failed ();
}
unique_ptr<machine>