From 32cecc78ad532393ba0f1b3e80db850dc33bf4b5 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 13 Aug 2014 15:36:30 -0400 Subject: [PATCH] 3551: Set mode of generated files more aggressively (overrule umask). --- docker/build_tools/config.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/build_tools/config.rb b/docker/build_tools/config.rb index 7f219400db..cee72cf85b 100755 --- a/docker/build_tools/config.rb +++ b/docker/build_tools/config.rb @@ -49,7 +49,10 @@ Dir.glob(globdir + '/*.in') do |template_file| generated_dir = File.join(File.dirname(template_file), 'generated') Dir.mkdir(generated_dir) unless Dir.exists? generated_dir output_path = File.join(generated_dir, File.basename(template_file, '.in')) - File.open(output_path, "w", File.stat(template_file).mode) do |output| + output_mode = (File.stat(template_file).mode & 0100) ? 0755 : 0644 + File.open(output_path, "w", output_mode) do |output| + # Set the mode again after opening, to thwart any prevailing umask: + output.chmod output_mode File.open(template_file) do |input| input.each_line do |line| -- 2.30.2