aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2018-04-24 22:56:18 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2018-04-24 22:56:18 -0700
commit967765f294f1390a9963e21c2918502e22e64caf (patch)
tree65f0f55d18acebb40fe20bafc8fa4b92a3b3983e /toolsrc/src
parent15f455e319a0f7db81c67f5da79af02397f42c45 (diff)
downloadvcpkg-967765f294f1390a9963e21c2918502e22e64caf.tar.gz
vcpkg-967765f294f1390a9963e21c2918502e22e64caf.zip
[osx] Ignore .DS_Store file. Fixes #3306
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/vcpkg/paragraphs.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/toolsrc/src/vcpkg/paragraphs.cpp b/toolsrc/src/vcpkg/paragraphs.cpp
index 41ffceec7..77c028937 100644
--- a/toolsrc/src/vcpkg/paragraphs.cpp
+++ b/toolsrc/src/vcpkg/paragraphs.cpp
@@ -253,6 +253,10 @@ namespace vcpkg::Paragraphs
LoadResults ret;
auto port_dirs = fs.get_files_non_recursive(ports_dir);
Util::sort(port_dirs);
+ Util::erase_remove_if(port_dirs, [&](auto&& port_dir_entry) {
+ return fs.is_regular_file(port_dir_entry) && port_dir_entry.filename() == ".DS_Store";
+ });
+
for (auto&& path : port_dirs)
{
auto maybe_spgh = try_load_port(fs, path);