Skip to content
This repository has been archived by the owner on Feb 28, 2020. It is now read-only.

Issue#28 OPatch jre switch fails at command line, so prefer jdk #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue#28 OPatch jre switch fails at command line, so prefer jdk #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fmw_opatch/providers/opatch_windows.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def load_current_resource
else
converge_by("Create resource #{ @new_resource }") do
result = false
shell_out!("#{@new_resource.oracle_home_dir}\\OPatch\\opatch.bat apply -silent -jre #{@new_resource.java_home_dir}/jre -oh #{@new_resource.oracle_home_dir} #{@new_resource.tmp_dir}/#{@new_resource.patch_id}", :timeout => 1200).stdout.each_line do |line|
shell_out!("#{@new_resource.oracle_home_dir}\\OPatch\\opatch.bat apply -silent -jdk #{@new_resource.java_home_dir} -oh #{@new_resource.oracle_home_dir} #{@new_resource.tmp_dir}/#{@new_resource.patch_id}", :timeout => 1200).stdout.each_line do |line|
unless line.nil?
Chef::Log.info(line)
if line.include? 'OPatch completed' or line.include? 'OPatch succeeded'
Expand All @@ -66,7 +66,7 @@ def load_current_resource
if @current_resource.exists
converge_by("Rollback resource #{ @new_resource }") do
result = false
shell_out!("#{@new_resource.oracle_home_dir}\\OPatch\\opatch rollback -id #{@new_resource.patch_id} -silent -jre #{@new_resource.java_home_dir}/jre -oh #{@new_resource.oracle_home_dir}", :timeout => 1200).stdout.each_line do |line|
shell_out!("#{@new_resource.oracle_home_dir}\\OPatch\\opatch rollback -id #{@new_resource.patch_id} -silent -jdk #{@new_resource.java_home_dir} -oh #{@new_resource.oracle_home_dir}", :timeout => 1200).stdout.each_line do |line|
unless line.nil?
Chef::Log.info(line)
if line.include? 'OPatch completed' or line.include? 'OPatch succeeded'
Expand Down