From 5d58eb29cc9ae584335e3380c2645baf05b21222 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 3 Oct 2016 17:45:01 -0700 Subject: [package_spec] Force using the factories that do sanity checks --- toolsrc/src/lib.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toolsrc/src/lib.cpp') diff --git a/toolsrc/src/lib.cpp b/toolsrc/src/lib.cpp index 2127b7850..92451156a 100644 --- a/toolsrc/src/lib.cpp +++ b/toolsrc/src/lib.cpp @@ -135,7 +135,7 @@ static std::string get_fullpkgname_from_listfile(const fs::path& path) static fs::path prefix_path_for_package(const vcpkg_paths& paths, const BinaryParagraph& pgh) { - return paths.package_dir({pgh.name, pgh.target_triplet}); + return paths.package_dir(package_spec::from_name_and_triplet(pgh.name, pgh.target_triplet)); } static void write_update(const vcpkg_paths& paths, const StatusParagraph& p) @@ -316,7 +316,7 @@ static deinstall_plan deinstall_package_plan( void vcpkg::deinstall_package(const vcpkg_paths& paths, const package_spec& spec, StatusParagraphs& status_db) { - auto package_it = status_db.find(spec.name, spec.target_triplet); + auto package_it = status_db.find(spec.name(), spec.target_triplet()); if (package_it == status_db.end()) { System::println(System::color::success, "Package %s is not installed", spec); -- cgit v1.2.3