diff options
| author | ras0219 <robertallenschumacher@gmail.com> | 2020-06-30 14:02:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-30 14:02:26 -0700 |
| commit | 3f6342db6ded036422886da6ccf8191685dc2ccf (patch) | |
| tree | c1377b8116c1ca8b8ef61fdbf6c8fa6b4dcc1dad /toolsrc/include | |
| parent | 1d8f0acc9c3085d18152a3f639077a28109196b6 (diff) | |
| download | vcpkg-3f6342db6ded036422886da6ccf8191685dc2ccf.tar.gz vcpkg-3f6342db6ded036422886da6ccf8191685dc2ccf.zip | |
[vcpkg] Fix `vcpkg export --nuget` regressions (#12174)
* [vcpkg] Upgrade find_acquire_program(NUGET) to 5.5.1. Add partial SHA to temporary download paths to avoid collisions.
* [vcpkg] Fix regression in `vcpkg export --nuget` due to file locking on .vcpkg-root
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/base/files.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h index 49a473091..dce9584fa 100644 --- a/toolsrc/include/vcpkg/base/files.h +++ b/toolsrc/include/vcpkg/base/files.h @@ -64,10 +64,7 @@ namespace fs using type = intptr_t; // HANDLE type system_handle = -1; - bool is_valid() const - { - return system_handle != -1; - } + bool is_valid() const { return system_handle != -1; } }; #else @@ -87,10 +84,7 @@ namespace fs using type = int; // file descriptor type system_handle = -1; - bool is_valid() const - { - return system_handle != -1; - } + bool is_valid() const { return system_handle != -1; } }; #endif @@ -176,6 +170,7 @@ namespace vcpkg::Files const fs::path& newpath, fs::copy_options opts, std::error_code& ec) = 0; + void copy_file(const fs::path& oldpath, const fs::path& newpath, fs::copy_options opts, LineInfo li); virtual void copy_symlink(const fs::path& oldpath, const fs::path& newpath, std::error_code& ec) = 0; virtual fs::file_status status(const fs::path& path, std::error_code& ec) const = 0; virtual fs::file_status symlink_status(const fs::path& path, std::error_code& ec) const = 0; |