398066 Restored narrow path in ProductAction used by the PDEv20130131-135455

- Restoring the strange behaviour - just read the comment that attempts
  to explain it - needed by PDE UI (see bug 398066) and the PDE tests
  (see bug 390361 comment #3). I don't see a problem that we keep this
  behaviour because it is only relevant in case a caller (like the PDE)
  choose to ignore the status code.
- The ProductAction still treats cases as fatal (returning an error
  status) where it would either have to ignore parts of the product file
  or guess the platform filters of bundles.

Bug: 398066

1 files changed, 5 insertions, 2 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 f0e17855c..650f1dd3c 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
@@ -187,8 +187,11 @@ public class ProductAction extends AbstractPublisherAction {
 				// if the bundle is platform specific we will have broken metadata due to a missing filter
 				finalStatus.add(new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.message_cannotDetermineFilterOnInclusion, element.getId(), elementVersion)));
 
-				// best effort guess for callers who choose to ignore this problem
-				result.add(new VersionedId(element.getId(), elementVersion));
+				// preserve legacy behaviour for callers who choose to ignore the error status:
+				// include element without filter, but only if there was an IVersionAdvice with "no advice" for this bundle (see bug 398066)
+				if (elementVersion != null) {
+					result.add(new VersionedId(element.getId(), elementVersion));
+				}
 			}
 		}
 		return result;