aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-05-23 17:29:41 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-05-23 17:29:41 +0100
commit3608dd9c7775299143bda346f5344b8be1f8a7ae (patch)
treebea16c6bc3c21f153360ac72d35163660855c0b1
parentc1a470d25af8d37269144b3a5df228962919790f (diff)
downloadpaludis-3608dd9c7775299143bda346f5344b8be1f8a7ae.tar.gz
paludis-3608dd9c7775299143bda346f5344b8be1f8a7ae.tar.xz
Check for more exceptions
-rw-r--r--paludis/install_task.cc16
-rw-r--r--paludis/install_task.hh2
-rw-r--r--src/output/console_install_task.cc2
-rw-r--r--src/output/console_install_task.hh2
4 files changed, 11 insertions, 11 deletions
diff --git a/paludis/install_task.cc b/paludis/install_task.cc
index fc02875..e342ca4 100644
--- a/paludis/install_task.cc
+++ b/paludis/install_task.cc
@@ -1069,22 +1069,22 @@ InstallTask::_main_actions_all(const int y, const DepList::Iterator dep_last_pac
{
_one(dep, x, y, s, f, is_first, is_last, output_manager_holder);
}
- catch (const InstallActionError & e)
+ catch (const FetchActionError & e)
{
- dep->handled().reset(new DepListEntryHandledFailed);
+ dep->handled().reset(new DepListEntryHandledFetchFailed);
if (output_manager_holder && output_manager_holder->output_manager_if_constructed())
- on_install_action_error(output_manager_holder->output_manager_if_constructed(), e);
+ on_fetch_action_error(output_manager_holder->output_manager_if_constructed(), e);
else
- on_install_action_error(make_shared_ptr(new StandardOutputManager), e);
+ on_fetch_action_error(make_shared_ptr(new StandardOutputManager), e);
++f;
}
- catch (const FetchActionError & e)
+ catch (const ActionError & e)
{
- dep->handled().reset(new DepListEntryHandledFetchFailed);
+ dep->handled().reset(new DepListEntryHandledFailed);
if (output_manager_holder && output_manager_holder->output_manager_if_constructed())
- on_fetch_action_error(output_manager_holder->output_manager_if_constructed(), e);
+ on_install_action_error(output_manager_holder->output_manager_if_constructed(), e);
else
- on_fetch_action_error(make_shared_ptr(new StandardOutputManager), e);
+ on_install_action_error(make_shared_ptr(new StandardOutputManager), e);
++f;
}
diff --git a/paludis/install_task.hh b/paludis/install_task.hh
index 48c4577..d2fce11 100644
--- a/paludis/install_task.hh
+++ b/paludis/install_task.hh
@@ -210,7 +210,7 @@ namespace paludis
virtual void on_had_both_package_and_set_targets_error(const HadBothPackageAndSetTargets &) = 0;
virtual void on_multiple_set_targets_specified(const MultipleSetTargetsSpecified &) = 0;
- virtual void on_install_action_error(const std::tr1::shared_ptr<OutputManager> &, const InstallActionError &) = 0;
+ virtual void on_install_action_error(const std::tr1::shared_ptr<OutputManager> &, const ActionError &) = 0;
virtual void on_fetch_action_error(const std::tr1::shared_ptr<OutputManager> &, const FetchActionError &) = 0;
virtual void on_phase_skip(const std::tr1::shared_ptr<OutputManager> & output_manager, const std::string & phase) = 0;
diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index 9e312d7..40ffeda 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -1474,7 +1474,7 @@ ConsoleInstallTask::on_ambiguous_package_name_error(const AmbiguousPackageNameEr
}
void
-ConsoleInstallTask::on_install_action_error(const std::tr1::shared_ptr<OutputManager> & output_manager, const InstallActionError & e)
+ConsoleInstallTask::on_install_action_error(const std::tr1::shared_ptr<OutputManager> & output_manager, const ActionError & e)
{
output_manager->stdout_stream() << endl;
output_manager->stdout_stream() << "Install error:" << endl;
diff --git a/src/output/console_install_task.hh b/src/output/console_install_task.hh
index 220c12a..0781eab 100644
--- a/src/output/console_install_task.hh
+++ b/src/output/console_install_task.hh
@@ -176,7 +176,7 @@ namespace paludis
virtual void on_had_both_package_and_set_targets_error(const HadBothPackageAndSetTargets &);
virtual void on_multiple_set_targets_specified(const MultipleSetTargetsSpecified &);
- virtual void on_install_action_error(const std::tr1::shared_ptr<OutputManager> &, const InstallActionError &);
+ virtual void on_install_action_error(const std::tr1::shared_ptr<OutputManager> &, const ActionError &);
virtual void on_fetch_action_error(const std::tr1::shared_ptr<OutputManager> &, const FetchActionError &);
virtual void on_display_failure_summary_pre();