Skip to content

Commit 98969b8

Browse files
committed
Merge remote-tracking branch 'vinzent/tmpdir_prefix' into kpaulisse-release
2 parents c690aa1 + 4169ef1 commit 98969b8

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

lib/octocatalog-diff/catalog-util/builddir.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class BuildDir
3838
# @param options [Hash] Options for class; see above description
3939
def initialize(options = {}, logger = nil)
4040
@options = options.dup
41-
@tempdir = Dir.mktmpdir
41+
@tempdir = Dir.mktmpdir('ocd-builddir-')
4242
at_exit { FileUtils.rm_rf(@tempdir) if File.directory?(@tempdir) }
4343

4444
@factdir = nil

lib/octocatalog-diff/catalog/computed.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def bootstrap(logger)
9999
tmphash[:basedir] = @options[:bootstrapped_dir]
100100
elsif @options[:branch] == '.'
101101
if @options[:bootstrap_current]
102-
tmphash[:basedir] = Dir.mktmpdir
102+
tmphash[:basedir] = Dir.mktmpdir('ocd-bootstrap-basedir-')
103103
at_exit { cleanup_checkout_dir(tmphash[:basedir], logger) }
104104

105105
FileUtils.cp_r File.join(@options[:basedir], '.'), tmphash[:basedir]
@@ -110,7 +110,7 @@ def bootstrap(logger)
110110
tmphash[:basedir] = @options[:basedir]
111111
end
112112
else
113-
checkout_dir = Dir.mktmpdir
113+
checkout_dir = Dir.mktmpdir('ocd-bootstrap-checkout-')
114114
at_exit { cleanup_checkout_dir(checkout_dir, logger) }
115115
tmphash[:basedir] = checkout_dir
116116
OctocatalogDiff::CatalogUtil::Bootstrap.bootstrap_directory(@options.merge(path: checkout_dir), logger)

lib/octocatalog-diff/util/parallel.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def self.run_tasks(task_array, logger = nil, parallelized = true, raise_exceptio
107107
# @return [Exception] First exception encountered by a child process; returns nil if no exceptions encountered.
108108
def self.run_tasks_parallel(result, task_array, logger)
109109
pidmap = {}
110-
ipc_tempdir = Dir.mktmpdir
110+
ipc_tempdir = Dir.mktmpdir('ocd-ipc-')
111111

112112
# Child process forking
113113
task_array.each_with_index do |task, index|

lib/octocatalog-diff/util/scriptrunner.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def log(priority, message, logger = @logger)
9191
# @return [String] Path to tempfile containing script
9292
def temp_script(script)
9393
raise Errno::ENOENT, "Script '#{script}' not found" unless File.file?(script)
94-
temp_dir = Dir.mktmpdir
94+
temp_dir = Dir.mktmpdir('ocd-scriptrunner-')
9595
at_exit do
9696
begin
9797
FileUtils.remove_entry_secure temp_dir

0 commit comments

Comments
 (0)