YUKI Hiroshi
null+****@clear*****
Thu Sep 25 18:19:24 JST 2014
YUKI Hiroshi 2014-09-25 18:19:24 +0900 (Thu, 25 Sep 2014) New Revision: a9130db50a69ac85e876c796435c887663022f37 https://github.com/droonga/droonga-engine/commit/a9130db50a69ac85e876c796435c887663022f37 Message: Set file permissions correctly to files for the service Modified files: bin/droonga-engine-catalog-generate bin/droonga-engine-catalog-modify lib/droonga/safe_file_writer.rb Modified: bin/droonga-engine-catalog-generate (+9 -1) =================================================================== --- bin/droonga-engine-catalog-generate 2014-09-25 18:08:33 +0900 (3752857) +++ bin/droonga-engine-catalog-generate 2014-09-25 18:19:24 +0900 (dfe7b0d) @@ -106,6 +106,11 @@ if datasets[Droonga::CatalogGenerator::DEFAULT_DATASET].empty? datasets.delete(Droonga::CatalogGenerator::DEFAULT_DATASET) end +if service_installation.user_exist? and + options.output_path == Droonga::Path.catalog + options.for_service = true +end + datasets.each do |name, options| generator.add_dataset(name, options) end @@ -121,6 +126,9 @@ def open_output(path) end catalog = generator.generate -open_output(options.output_path) do |output| +open_output(options.output_path) do |output, file| output.puts(JSON.pretty_generate(catalog)) + if options.for_service + service_installation.ensure_correct_file_permission(file) + end end Modified: bin/droonga-engine-catalog-modify (+8 -1) =================================================================== --- bin/droonga-engine-catalog-modify 2014-09-25 18:08:33 +0900 (d26bf75) +++ bin/droonga-engine-catalog-modify 2014-09-25 18:19:24 +0900 (4cf28bb) @@ -85,6 +85,10 @@ parser.parse!(ARGV) if options.source_path != "-" and options.update options.output_path = options.source_path end +if service_installation.user_exist? and + options.output_path == Droonga::Path.catalog + options.for_service = true +end def load_source(path) source = nil @@ -112,6 +116,9 @@ def open_output(path) end catalog = generator.generate -open_output(options.output_path) do |output| +open_output(options.output_path) do |output, file| output.puts(JSON.pretty_generate(catalog)) + if options.for_service + service_installation.ensure_correct_file_permission(file) + end end Modified: lib/droonga/safe_file_writer.rb (+1 -1) =================================================================== --- lib/droonga/safe_file_writer.rb 2014-09-25 18:08:33 +0900 (a7549e6) +++ lib/droonga/safe_file_writer.rb 2014-09-25 18:19:24 +0900 (fb402a0) @@ -26,7 +26,7 @@ module Droonga FileUtils.mkdir_p(path.dirname.to_s) Tempfile.open(path.basename.to_s, path.dirname.to_s, "w") do |output| if block_given? - yield(output) + yield(output, output.path) else output.write(contents) end -------------- next part -------------- HTML����������������������������...Download