aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-03-07 18:00:39 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-03-07 18:00:39 +0000
commit5bf7228bd5524c9cb5214285ef30604c1859e096 (patch)
treeb615a2319ef80befc97449842544f6c1eb2be915
parent1c4ae968b3675e600d1cefa8d7e2f5fbba37d686 (diff)
downloadpaludis-5bf7228bd5524c9cb5214285ef30604c1859e096.tar.gz
paludis-5bf7228bd5524c9cb5214285ef30604c1859e096.tar.xz
Fix resume command display after a signal.
-rw-r--r--src/output/console_install_task.cc6
-rw-r--r--src/output/console_install_task.hh2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index f539238..2eb1174 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -129,7 +129,8 @@ ConsoleInstallTask::ConsoleInstallTask(Environment * const env,
_download_size(0),
_all_tags(new Set<DepTagEntry>),
_all_use_descriptions(new Set<UseDescription, UseDescriptionComparator>),
- _all_expand_prefixes(new UseFlagNameSet)
+ _all_expand_prefixes(new UseFlagNameSet),
+ _resolution_finished(false)
{
std::fill_n(_counts, static_cast<int>(last_count), 0);
}
@@ -223,6 +224,7 @@ void
ConsoleInstallTask::on_build_deplist_post()
{
output_activity_end_message();
+ _resolution_finished = true;
}
void
@@ -1763,7 +1765,7 @@ ConsoleInstallTask::show_resume_command() const
void
ConsoleInstallTask::show_resume_command(const std::string & resume_command_template) const
{
- if (had_action_failures())
+ if (_resolution_finished)
{
std::string resume_command(make_resume_command(true));
if (resume_command.empty())
diff --git a/src/output/console_install_task.hh b/src/output/console_install_task.hh
index 5a45085..3651de6 100644
--- a/src/output/console_install_task.hh
+++ b/src/output/console_install_task.hh
@@ -121,6 +121,8 @@ namespace paludis
void _add_descriptions(tr1::shared_ptr<const UseFlagNameSet>,
const tr1::shared_ptr<const PackageID> &, UseDescriptionState);
+ bool _resolution_finished;
+
protected:
ConsoleInstallTask(Environment * const env, const DepListOptions & options,
tr1::shared_ptr<const DestinationsSet>);