Skip to content

C
cocoapods
Commit 11daa2af authored by Samuel E. Giddins's avatar Samuel E. Giddins
Browse files
Options

Merge pull request #2991 from timshadel/patch-2 

Fix uninitialized constant Class::YAML crash
parents 644d62ff 23f30290
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
CHANGELOG.md
View file @ 11daa2af
...@@ -195,6 +195,9 @@ For more details, see :memo: [CocoaPods 0.35](http://blog.cocoapods.org/CocoaPod ...@@ -195,6 +195,9 @@ For more details, see :memo: [CocoaPods 0.35](http://blog.cocoapods.org/CocoaPod
copying resources to main application bundle. copying resources to main application bundle.
[Yan Rabovik](https://github.com/rabovik) [Yan Rabovik](https://github.com/rabovik)
* Fix uninitialized constant Class::YAML crash in some cases.
[Tim Shadel](https://github.com/timshadel)
##### Enhancements ##### Enhancements
* `pod search`, `pod spec which`, `pod spec cat` and `pod spec edit` * `pod search`, `pod spec which`, `pod spec cat` and `pod spec edit`
......
lib/cocoapods/sources_manager.rb
View file @ 11daa2af
...@@ -144,6 +144,7 @@ module Pod ...@@ -144,6 +144,7 @@ module Pod
def updated_search_index def updated_search_index
unless @updated_search_index unless @updated_search_index
if search_index_path.exist? if search_index_path.exist?
require 'yaml'
stored_index = YAML.load(search_index_path.read) stored_index = YAML.load(search_index_path.read)
if stored_index && stored_index.is_a?(Hash) if stored_index && stored_index.is_a?(Hash)
search_index = aggregate.update_search_index(stored_index) search_index = aggregate.update_search_index(stored_index)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment