Updates: os exclusions for patches

platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/BuildInfo.java

@@ -96,7 +96,8 @@ public class BuildInfo implements Comparable<BuildInfo> {
   public PatchInfo findPatchForCurrentBuild() {
     BuildNumber currentBuild = ApplicationInfo.getInstance().getBuild();
     for (PatchInfo each : myPatches) {
-      if (each.getFromBuild().asStringWithoutProductCode().equals(currentBuild.asStringWithoutProductCode())) return each;
+      if (each.isAvailable() && each.getFromBuild().asStringWithoutProductCode().equals(currentBuild.asStringWithoutProductCode())) 
+        return each;
     }
     return null;
   }

platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PatchInfo.java

@@ -20,15 +20,34 @@
 package com.intellij.openapi.updateSettings.impl;
 
 import com.intellij.openapi.util.BuildNumber;
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
 import org.jdom.Element;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class PatchInfo {
   private final BuildNumber myFromBuild;
   private final String mySize;
 
+  private final Set<String> myExcludedOSes = new HashSet<String>();
+
   public PatchInfo(Element node) {
     myFromBuild = BuildNumber.fromString(node.getAttributeValue("from"));
     mySize = node.getAttributeValue("size");
+    
+    String excluded = node.getAttributeValue("exclusions");
+    if (excluded != null) {
+      myExcludedOSes.addAll(ContainerUtil.map(StringUtil.split(excluded, ","), new Function<String, String>() {
+        @Override
+        public String fun(String s) {
+          return s.trim();
+        }
+      }));
+    }
   }
 
   public BuildNumber getFromBuild() {
@@ -38,4 +57,15 @@ public class PatchInfo {
   public String getSize() {
     return mySize;
   }
+
+  public boolean isAvailable() {
+    return !myExcludedOSes.contains(getOSSuffix());
+  }
+
+  public String getOSSuffix() {
+    if (SystemInfo.isWindows) return "win";
+    if (SystemInfo.isMac) return "mac";
+    if (SystemInfo.isUnix) return "unix";
+    return "unknown";
+  }
 }

platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java

@@ -645,10 +645,7 @@ public final class UpdateChecker {
 
     String productCode = ApplicationInfo.getInstance().getBuild().getProductCode();
 
-    String osSuffix = "";
-    if (SystemInfo.isWindows) osSuffix = "-win";
-    else if (SystemInfo.isMac) osSuffix = "-mac";
-    else if (SystemInfo.isUnix) osSuffix = "-unix";
+    String osSuffix = "-" + patch.getOSSuffix();
 
     String fromBuildNumber = patch.getFromBuild().asStringWithoutProductCode();
     String toBuildNumber = newVersion.getNumber().asStringWithoutProductCode();