Skip to content

Commit

Permalink
resovle conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
jjiwooLim committed Oct 2, 2023
1 parent b780d85 commit f70a772
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,7 @@ public static String productInfo(File installDirectory, String action) throws Pl
}
}

private void installFeaturesOnContainer(List<String> features, boolean acceptLicense) throws PluginExecutionException {
private void installFeaturesOnContainer(List<String> features, boolean acceptLicense, VerifyOption verifyOption) throws PluginExecutionException {
if (features == null || features.isEmpty()) {
debug("Skipping installing features on container " + containerName + " since no features were specified.");
return;
Expand All @@ -1173,7 +1173,7 @@ private void installFeaturesOnContainer(List<String> features, boolean acceptLic
featureUtilityCommand += "--verify=" + verifyOption.name();
}

String cmdResult = execDockerCmd(featureUtilityCommand, 600, false);
String cmdResult = execContainerCmd(featureUtilityCommand, 600, false);
if (cmdResult.contains(" RC=")) { // This piece of the string is added in execDockerCmd if there is an error
if (cmdResult.contains("CWWKF1250I")) {
// The features are already installed message
Expand Down

0 comments on commit f70a772

Please sign in to comment.