aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Hale <Squareys@googlemail.com>2018-02-16 23:50:36 +0100
committerRobert Schumacher <roschuma@microsoft.com>2018-02-16 14:50:36 -0800
commit72bc3647b61ad3e8df8d1e620daa7d919b5241d6 (patch)
tree3389a4fca31a68affdc7d039e13bf5e07580fac3
parent726695c65cfdd2f7fc43b09a5e064dbf4506b004 (diff)
downloadvcpkg-72bc3647b61ad3e8df8d1e620daa7d919b5241d6.tar.gz
vcpkg-72bc3647b61ad3e8df8d1e620daa7d919b5241d6.zip
[vcpkg] Fix bug with missing dependencies introduced in #2697 (#2819)
When a package dependency was not found (has no source control file), install would exit with "Value was null" when trying to install its default features, as the dependency would be marked erroneously as found in this case. Signed-off-by: Squareys <squareys@googlemail.com>
-rw-r--r--toolsrc/src/vcpkg/dependencies.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp
index 307c779c8..fedda56ab 100644
--- a/toolsrc/src/vcpkg/dependencies.cpp
+++ b/toolsrc/src/vcpkg/dependencies.cpp
@@ -454,14 +454,14 @@ namespace vcpkg::Dependencies
return res;
}
}
+ }
- // "core" is always an implicit default feature. In case we did not add it as
- // a dependency above (e.g. no default features), add it here.
- auto res = mark_plus("core", cluster, graph, graph_plan, prevent_default_features);
- if (res != MarkPlusResult::SUCCESS)
- {
- return res;
- }
+ // "core" is always an implicit default feature. In case we did not add it as
+ // a dependency above (e.g. no default features), add it here.
+ auto res = mark_plus("core", cluster, graph, graph_plan, prevent_default_features);
+ if (res != MarkPlusResult::SUCCESS)
+ {
+ return res;
}
return MarkPlusResult::SUCCESS;