Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2012-04-27 21:10:50 -0400
committerPascal Rapicault2012-04-27 21:17:44 -0400
commit3ae7052955faa45c91b29e331a7e221cdd15562c (patch)
tree558db68be6e6064208881bf91f94fa7b78c5f2ed /bundles/org.eclipse.equinox.p2.publisher
parent5f304d6941d7ccfa810a553d41d3900c77784a8e (diff)
downloadrt.equinox.p2-3ae7052955faa45c91b29e331a7e221cdd15562c.tar.gz
rt.equinox.p2-3ae7052955faa45c91b29e331a7e221cdd15562c.tar.xz
rt.equinox.p2-3ae7052955faa45c91b29e331a7e221cdd15562c.zip
Support for bundled macosx - http://bugs.eclipse.org/57349v20120428-0117
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.publisher')
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java
index 8fa15b253..dd780e619 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2010 Code 9 and others. All rights reserved. This
+ * Copyright (c) 2008, 2012 Code 9 and others. All rights reserved. This
* program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -8,6 +8,7 @@
* Code 9 - initial API and implementation
* IBM - ongoing development
* SAP - ongoing development
+ * Pascal Rapicault - Support for bundled macosx http://bugs.eclipse.org/57349
******************************************************************************/
package org.eclipse.equinox.p2.publisher;
@@ -102,6 +103,13 @@ public abstract class AbstractPublisherAction implements IPublisherAction {
* parse into a filter.
*/
protected IMatchExpression<IInstallableUnit> createFilterSpec(String configSpec) {
+ String ldap = createLDAPString(configSpec);
+ if (ldap == null)
+ return null;
+ return InstallableUnit.parseFilter(ldap);
+ }
+
+ protected String createLDAPString(String configSpec) {
String[] config = parseConfigSpec(configSpec);
if (config[0] != null || config[1] != null || config[2] != null) {
String filterWs = config[0] != null && !CONFIG_ANY.equalsIgnoreCase(config[0]) ? "(osgi.ws=" + config[0] + ")" : ""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -109,7 +117,7 @@ public abstract class AbstractPublisherAction implements IPublisherAction {
String filterArch = config[2] != null && !CONFIG_ANY.equalsIgnoreCase(config[2]) ? "(osgi.arch=" + config[2] + ")" : ""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
if (filterWs.length() == 0 && filterOs.length() == 0 && filterArch.length() == 0)
return null;
- return InstallableUnit.parseFilter("(& " + filterWs + filterOs + filterArch + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+ return "(& " + filterWs + filterOs + filterArch + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
return null;
}

Back to the top