projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
76319ef
)
3551: Set mode of generated files more aggressively (overrule umask).
author
Tom Clegg <tom@curoverse.com>
Wed, 13 Aug 2014 19:36:30 +0000
(15:36 -0400)
committer
Tom Clegg <tom@curoverse.com>
Wed, 13 Aug 2014 19:36:30 +0000
(15:36 -0400)
docker/build_tools/config.rb
patch
|
blob
|
history
diff --git
a/docker/build_tools/config.rb
b/docker/build_tools/config.rb
index 7f219400dbb857b66bf55a7b5841da8d5617c3ea..cee72cf85b49bcca03af6c7fabc1338a49dadce8 100755
(executable)
--- 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'))
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|
File.open(template_file) do |input|
input.each_line do |line|