aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Danny van Dyk <dvandyk@exherbo.org> 2006-12-29 01:28:58 +0000
committerAvatar Danny van Dyk <dvandyk@exherbo.org> 2006-12-29 01:28:58 +0000
commit8195877cfb234e543dca9bd985a212690d84bfa1 (patch)
tree66fc63f59b6bee23bec70d18865b67f6d7e5e24e
parentee9056208f2225648edc99536e9e27cbf748be08 (diff)
downloadpaludis-8195877cfb234e543dca9bd985a212690d84bfa1.tar.gz
paludis-8195877cfb234e543dca9bd985a212690d84bfa1.tar.xz
Fix bogus call to on_build_succeed hook on failed builds.
-rw-r--r--paludis/tasks/stage_builder_task.cc9
-rw-r--r--src/clients/contrarius/stage.cc10
2 files changed, 6 insertions, 13 deletions
diff --git a/paludis/tasks/stage_builder_task.cc b/paludis/tasks/stage_builder_task.cc
index a60a076..14f9c36 100644
--- a/paludis/tasks/stage_builder_task.cc
+++ b/paludis/tasks/stage_builder_task.cc
@@ -80,11 +80,6 @@ StageBuilderTask::execute()
{
Context context("When executing stage builder task:");
-#if 0
- if (_imp->stages.empty())
- throw NoStageListError(); //TODO: Needed?
-#endif
-
on_build_all_pre();
for (std::list<StageBase::ConstPointer>::const_iterator
@@ -103,9 +98,7 @@ StageBuilderTask::execute()
continue;
}
- (*s)->build(_imp->options);
-
- if (! _imp->options.pretend)
+ if (((*s)->build(_imp->options)) && (! _imp->options.pretend))
on_build_succeed(*s);
}
catch (const StageBuildError & e)
diff --git a/src/clients/contrarius/stage.cc b/src/clients/contrarius/stage.cc
index b995003..72462fb 100644
--- a/src/clients/contrarius/stage.cc
+++ b/src/clients/contrarius/stage.cc
@@ -65,7 +65,7 @@ BinutilsStage::build(const StageOptions &) const
DefaultConfig::get_instance()->clear_forced_use_config();
- return do_install(_options.binutils);
+ return 0 == do_install(_options.binutils);
}
bool
@@ -85,7 +85,7 @@ KernelHeadersStage::build(const StageOptions &) const
_options.headers, UseFlagName("crosscompile_opts_headers-only"),
use_disabled));
- return do_install(_options.headers);
+ return 0 == do_install(_options.headers);
}
bool
@@ -120,7 +120,7 @@ MinimalStage::build(const StageOptions &) const
DefaultConfig::get_instance()->add_forced_use_config(UseConfigEntry(
_options.gcc, UseFlagName("crosscompile_opts_bootstrap"), use_enabled));
- return do_install(_options.gcc);
+ return 0 == do_install(_options.gcc);
}
bool
@@ -137,7 +137,7 @@ LibCStage::build(const StageOptions &) const
DefaultConfig::get_instance()->clear_forced_use_config();
- return do_install(_options.libc);
+ return 0 == do_install(_options.libc);
}
bool
@@ -167,7 +167,7 @@ FullStage::build(const StageOptions &) const
DefaultConfig::get_instance()->add_forced_use_config(UseConfigEntry(
_options.gcc, UseFlagName("objc-gc"), use_disabled));
- return do_install(_options.gcc);
+ return 0 == do_install(_options.gcc);
}
bool