Skip to content

Commit 4d4d653

Browse files
Merge pull request #764 from cedws/UnsetHOMEFix
Remove stderr empty check to avoid docker_params_changed failures when warnings appear
2 parents 998d11d + 0655ffa commit 4d4d653

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: lib/puppet/functions/docker_params_changed.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ def detect_changes(opts)
7777
return_value = 'No changes detected'
7878

7979
if opts['sanitised_title'] && opts['osfamily']
80-
stdout, stderr, status = Open3.capture3("docker inspect #{opts['sanitised_title']}")
81-
if stderr.to_s == '' && status.to_s.include?('exit 0')
80+
stdout, _stderr, status = Open3.capture3("docker inspect #{opts['sanitised_title']}")
81+
if status.to_s.include?('exit 0')
8282
param_changed = false
8383
inspect_hash = JSON.parse(stdout)[0]
8484

Diff for: spec/helper/get_docker_params_changed.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ def get_docker_params_changed(opts)
66
return_value = 'No changes detected'
77

88
if opts['sanitised_title'] && opts['osfamily']
9-
stdout, stderr, status = Open3.capture3("docker inspect #{opts['sanitised_title']}")
10-
if stderr.to_s == '' && status.to_s.include?('exit 0')
9+
stdout, _stderr, status = Open3.capture3("docker inspect #{opts['sanitised_title']}")
10+
if status.to_s.include?('exit 0')
1111
param_changed = false
1212
inspect_hash = JSON.parse(stdout)[0]
1313

0 commit comments

Comments
 (0)