MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

updater: do not skip create optional actions for jre64 if patch apply to installation bundled jre64

Browse Source 
patch script: put updater log in artifacts

IDEA-208331 Patch script does not correctly prepare patches with files like *.1
This commit is contained in:
Vladimir.Orlov
2019-03-14 16:37:47 +03:00
parent 4e8760c26b
commit 7a8aacf0a9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
updater/src/com/intellij/updater/Patch.java
+5 -1
View File
@@ -362,9 +362,13 @@ public class Patch {
return new PatchFileCreator.ApplicationResult(false, appliedActions, t);
}
File jre64 = new File(toDir.getAbsolutePath() + "/jre64");
for (File directory : createdDirectories) {
File[] children = directory.listFiles();
if (children != null && createdOptionalFiles.containsAll(Arrays.asList(children))) {
if (children != null &&
(!directory.getAbsolutePath().contains("jre64") ||
directory.getAbsolutePath().contains("jre64") && !jre64.exists()) &&
createdOptionalFiles.containsAll(Arrays.asList(children))) {
Runner.logger().info("Pruning empty directory: " + directory);
try {
Utils.delete(directory);