Sophie

Sophie

distrib > Mageia > 6 > armv7hl > by-pkgid > b8add5f3320ec7a36fa0aac49140fc22 > files > 18

eclipse-4.6.3-6.mga6.src.rpm

--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java.orig	2012-05-05 15:24:03.000000000 +0200
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java	2012-05-17 16:14:48.607827015 +0200
@@ -807,7 +807,7 @@
 				//First check to see if there is already an IU around for this
 				IInstallableUnit bundleIU = queryForIU(result, bundleDescriptions[i].getSymbolicName(), PublisherHelper.fromOSGiVersion(bd.getVersion()));
 				IArtifactKey key = createBundleArtifactKey(bd.getSymbolicName(), bd.getVersion().toString());
-				if (bundleIU == null) {
+				if (bundleIU == null || !bd.getLocation().equals(bundleIU.getProperty("file.name"))) {
 					createAdviceFileAdvice(bundleDescriptions[i], info);
 					// Create the bundle IU according to any shape advice we have
 					bundleIU = doCreateBundleIU(bd, key, info);