From 5f4abfdfecc195b6255a5256843a839d072e4f79 Mon Sep 17 00:00:00 2001 From: Daniel Azuma Date: Wed, 5 Dec 2018 14:54:11 -0800 Subject: [PATCH] Don't crash the generator if api_names_out.yaml is absent (#746) --- lib/google/apis/generator/annotator.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/google/apis/generator/annotator.rb b/lib/google/apis/generator/annotator.rb index ef45f4a82..373e29c7d 100644 --- a/lib/google/apis/generator/annotator.rb +++ b/lib/google/apis/generator/annotator.rb @@ -42,13 +42,13 @@ module Google include NameHelpers def initialize(names_out_file_path = nil, names_file_path = nil) - if names_out_file_path + if names_out_file_path && File.file?(names_out_file_path) logger.info { sprintf('Loading API names from %s', names_out_file_path) } @names = YAML.load(File.read(names_out_file_path)) || {} else @names = {} end - if names_file_path + if names_file_path && File.file?(names_file_path) logger.info { sprintf('Loading API names from %s', names_file_path) } @names = @names.merge(YAML.load(File.read(names_file_path)) || {}) end