From b3773070fee854ad7a9ea93b8f65b09239947f36 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 31 Mar 2017 09:26:58 -0700 Subject: [vcpkg] Rework code structure to satisfy /analyze in VS2017 --- toolsrc/src/vcpkg_Dependencies.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp index dad144cfb..d641cd513 100644 --- a/toolsrc/src/vcpkg_Dependencies.cpp +++ b/toolsrc/src/vcpkg_Dependencies.cpp @@ -81,10 +81,15 @@ namespace vcpkg::Dependencies } expected maybe_spgh = Paragraphs::try_load_port(paths.port_dir(spec)); - SourceParagraph* spgh = maybe_spgh.get(); - Checks::check_exit(VCPKG_LINE_INFO, spgh != nullptr, "Cannot find package %s", spec.name()); - process_dependencies(filter_dependencies(spgh->depends, spec.target_triplet())); - was_examined.emplace(spec, install_plan_action{install_plan_type::BUILD_AND_INSTALL, nullopt, std::move(*spgh)}); + if (auto spgh = maybe_spgh.get()) + { + process_dependencies(filter_dependencies(spgh->depends, spec.target_triplet())); + was_examined.emplace(spec, install_plan_action{ install_plan_type::BUILD_AND_INSTALL, nullopt, std::move(*spgh) }); + } + else + { + Checks::exit_with_message(VCPKG_LINE_INFO, "Cannot find package %s", spec.name()); + } } std::vector ret; -- cgit v1.2.3