Skip to content

Commit

Permalink
Don't use :remove_destination option to FileUtils.cp_r
Browse files Browse the repository at this point in the history
  • Loading branch information
justinseanmartin committed Nov 25, 2023
1 parent 1413fde commit b75a097
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Expand Up @@ -14,10 +14,14 @@ To install release candidates run `[sudo] gem install cocoapods --pre`

##### Bug Fixes

* Fix pod install issue when git's `core.fsmonitor` feature is enabled
* Fix pod install issue when git's `core.fsmonitor` feature is enabled
[Justin Martin](https://github.com/justinseanmartin)
[#11640](https://github.com/CocoaPods/CocoaPods/issues/11640)

* Don't use the `remove_destination` parameter in FileUtils.cp_r
[Justin Martin](https://github.com/justinseanmartin)
[#12165](https://github.com/CocoaPods/CocoaPods/pull/12165)

## 1.14.3 (2023-11-19)

##### Enhancements
Expand Down
3 changes: 2 additions & 1 deletion lib/cocoapods/downloader.rb
Expand Up @@ -51,7 +51,8 @@ def self.download(
if target && result.location && target != result.location
UI.message "Copying #{request.name} from `#{result.location}` to #{UI.path target}", '> ' do
Cache.read_lock(result.location) do
FileUtils.cp_r(result.location, target, :remove_destination => true)
FileUtils.rm_rf(target)
FileUtils.cp_r(result.location, target)
end
end
end
Expand Down

0 comments on commit b75a097

Please sign in to comment.