aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/commands_install.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-02-13 14:01:27 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2017-02-15 18:06:06 -0800
commitc60c9de6e2371b31a79c58719df1d344b564111c (patch)
tree5620d19c1f277c409311bb7af95837faa75882cf /toolsrc/src/commands_install.cpp
parentcc1692f304ed5c2514e69a12c4ed974b0d7b679e (diff)
downloadvcpkg-c60c9de6e2371b31a79c58719df1d344b564111c.tar.gz
vcpkg-c60c9de6e2371b31a79c58719df1d344b564111c.zip
Restore dependency check in build_package()
Diffstat (limited to 'toolsrc/src/commands_install.cpp')
-rw-r--r--toolsrc/src/commands_install.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp
index a57d2cc6d..b1a0108b7 100644
--- a/toolsrc/src/commands_install.cpp
+++ b/toolsrc/src/commands_install.cpp
@@ -214,11 +214,10 @@ namespace vcpkg::Commands::Install
}
else if (action.plan.plan_type == install_plan_type::BUILD_AND_INSTALL)
{
- const Build::DependencyStatus dependency_status = Build::check_dependencies(*action.plan.source_pgh, action.spec, status_db);
- Checks::check_exit(dependency_status == Build::DependencyStatus::ALL_DEPENDENCIES_INSTALLED);
- const Build::BuildResult result = Commands::Build::build_package(*action.plan.source_pgh, action.spec, paths, paths.port_dir(action.spec), dependency_status);
- if (result != Build::BuildResult::SUCCESS)
+ const Build::BuildResult result = Commands::Build::build_package(*action.plan.source_pgh, action.spec, paths, paths.port_dir(action.spec), status_db);
+ if (result != Build::BuildResult::SUCCEEDED)
{
+ System::println(System::color::error, Build::create_error_message(action.spec.toString(), result));
exit(EXIT_FAILURE);
}
const BinaryParagraph bpgh = try_load_cached_package(paths, action.spec).get_or_throw();