Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortoberlies2011-06-24 09:58:07 -0400
committertoberlies2011-06-24 09:58:07 -0400
commit7b3153aabdcb293846df141a66843e5d52adba3d (patch)
treedc94024a4ee530e7681993d66732288c8eebb0de
parent79241b77b2ca608d426e44ef1e61ff4c25eac45a (diff)
downloadrt.equinox.p2-7b3153aabdcb293846df141a66843e5d52adba3d.tar.gz
rt.equinox.p2-7b3153aabdcb293846df141a66843e5d52adba3d.tar.xz
rt.equinox.p2-7b3153aabdcb293846df141a66843e5d52adba3d.zip
bug 325611: “useFeatures” attribute in .product file silently ignores included features/bundles depending on the attribute value
Allow contributions to multi status returned by perform(...) in other methods
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ProductAction.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ProductAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ProductAction.java
index 4e0061e3e..04d068d57 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ProductAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ProductAction.java
@@ -7,6 +7,7 @@
* Contributors:
* Code 9 - initial API and implementation
* IBM - ongoing development
+ * SAP AG - ongoing development
******************************************************************************/
package org.eclipse.equinox.p2.publisher.eclipse;
@@ -30,6 +31,7 @@ public class ProductAction extends AbstractPublisherAction {
protected File executablesFeatureLocation;
protected IProductDescriptor product;
protected IPublisherResult publisherResults;
+ protected MultiStatus finalStatus;
public ProductAction(String source, IProductDescriptor product, String flavor, File executablesFeatureLocation) {
super();
@@ -82,8 +84,8 @@ public class ProductAction extends AbstractPublisherAction {
monitor = SubMonitor.convert(monitor);
this.info = publisherInfo;
publisherResults = results;
+ finalStatus = new MultiStatus(EclipseInstallAction.class.getName(), 0, "publishing result", null); //$NON-NLS-1$
IPublisherAction[] actions = createActions(results);
- MultiStatus finalStatus = new MultiStatus(EclipseInstallAction.class.getName(), 0, "publishing result", null); //$NON-NLS-1$
for (int i = 0; i < actions.length; i++) {
if (monitor.isCanceled())
return Status.CANCEL_STATUS;

Back to the top