Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2013-04-19 18:10:28 +0000
committerJohn Arthorne2013-04-19 18:10:28 +0000
commit27d52698853e7b433b4d816ebaa7491fd79ab6d1 (patch)
tree88c65eb6ac9b5c761ebb60e6d90d5874128c85fd
parentc777b9ee8cc2374e8c8c672ff9d70be244e53749 (diff)
downloadrt.equinox.p2-R3_8_maintenance.tar.gz
rt.equinox.p2-R3_8_maintenance.tar.xz
rt.equinox.p2-R3_8_maintenance.zip
Bug 404619 - ProfileSynchronizer.createProfileChangeRequest() changes all existing features into root unitsR3_8_maintenance
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
index 001684fd9..71405be14 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
+++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2007, 2013 IBM Corporation 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
@@ -558,12 +558,16 @@ public class ProfileSynchronizer {
// if the IU is already installed in the profile then check to see if it was moved.
String one = iu.getProperty(RepositoryListener.FILE_NAME);
String two = existing.getProperty(RepositoryListener.FILE_NAME);
- // if we have an IU which has been moved, keep track of it.
- //
// cheat here... since we always set the filename property for bundles in the dropins,
// if the existing IU's filename is null then it isn't from the dropins. a better
// (and more expensive) way to find this out is to do an IU profile property query.
- if (one != null && two != null && !one.equals(two)) {
+ if (two == null) {
+ // This isn't a dropin.
+ iter.remove();
+ continue;
+ }
+ // if we have an IU which has been moved, keep track of it.
+ if (one != null && !one.equals(two)) {
toMove.add(iu);
continue;
}

Back to the top