diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-28 15:05:55 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-28 18:59:57 -0700 |
| commit | 42bd55e3ae815e43181facfdc161d29804014f26 (patch) | |
| tree | d0e4db89947aa557ec6e3bf6065cfb43cbc796ff /toolsrc/src/commands_ci.cpp | |
| parent | 67ce764c2ea7483860a3ad61441608d8978605ae (diff) | |
| download | vcpkg-42bd55e3ae815e43181facfdc161d29804014f26.tar.gz vcpkg-42bd55e3ae815e43181facfdc161d29804014f26.zip | |
Rework optional<T>
Diffstat (limited to 'toolsrc/src/commands_ci.cpp')
| -rw-r--r-- | toolsrc/src/commands_ci.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp index bfe87b35f..2d7016bcc 100644 --- a/toolsrc/src/commands_ci.cpp +++ b/toolsrc/src/commands_ci.cpp @@ -62,7 +62,11 @@ namespace vcpkg::Commands::CI } else if (action.plan.plan_type == install_plan_type::BUILD_AND_INSTALL) { - const BuildResult result = Commands::Build::build_package(*action.plan.source_pgh, action.spec, paths, paths.port_dir(action.spec), status_db); + const BuildResult result = Commands::Build::build_package(action.plan.source_pgh.get_or_exit(VCPKG_LINE_INFO), + action.spec, + paths, + paths.port_dir(action.spec), + status_db); timing.back() = build_timer.elapsed<std::chrono::milliseconds>().count(); results.back() = result; if (result != BuildResult::SUCCEEDED) @@ -77,7 +81,7 @@ namespace vcpkg::Commands::CI else if (action.plan.plan_type == install_plan_type::INSTALL) { results.back() = BuildResult::SUCCEEDED; - Install::install_package(paths, *action.plan.binary_pgh, &status_db); + Install::install_package(paths, action.plan.binary_pgh.get_or_exit(VCPKG_LINE_INFO), &status_db); System::println(System::color::success, "Package %s is installed from cache", action.spec); } else |