diff options
| author | Tim Smith <tsmith@chef.io> | 2018-10-30 14:36:00 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-10-31 12:39:33 -0700 |
| commit | 4d9242a362404c84b141fbfb65d954e136cf4736 (patch) | |
| tree | e4a353594ba7faf80b2bd84379a13006fc7ff6bd /spec | |
| parent | 36b8f51ad6a745647a999c6ec5d5ebd721c11c6b (diff) | |
| download | chef-4d9242a362404c84b141fbfb65d954e136cf4736.tar.gz | |
Fix testing / installing on SLES 15
Make sure we identify SLES 15 as suse for our zypper tests
Make sure we don't remove the symlinks on SLES when doing an upgrade or the new release will be broken
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/platform_helpers.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb index 6ae052ba1d..5ae9c01722 100644 --- a/spec/support/platform_helpers.rb +++ b/spec/support/platform_helpers.rb @@ -220,7 +220,8 @@ def selinux_enabled? end def suse? - File.exists?("/etc/SuSE-release") + ::File.exists?("/etc/SuSE-release") || + ( ::File.exists?("/etc/os-release") && /sles|suse/.match?(File.read("/etc/os-release")) ) end def root? |