summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (Ericsson)2013-01-24 11:59:45 (EST)
committerPascal Rapicault2013-01-27 22:09:46 (EST)
commit6177c466083fb7676ebfe5790bc0951043b3b727 (patch)
treefb28624c520827d9e9ee7129457035f52776962d
parentf04f46d6d283a6235367872b5eaa7e3e483509ed (diff)
downloadrt.equinox.p2-6177c466083fb7676ebfe5790bc0951043b3b727.zip
rt.equinox.p2-6177c466083fb7676ebfe5790bc0951043b3b727.tar.gz
rt.equinox.p2-6177c466083fb7676ebfe5790bc0951043b3b727.tar.bz2
detection of change in the reconciler
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java7
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java2
2 files changed, 8 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java
index d8da4f5..8008719 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java
@@ -227,6 +227,13 @@ public class Activator implements BundleActivator {
trace("Performing reconciliation."); //$NON-NLS-1$
return false;
}
+ // master configuration changed. Reconcile.
+ if (Boolean.TRUE.toString().equalsIgnoreCase(System.getProperty(ProfileSynchronizer.PROP_IGNORE_USER_CONFIGURATION))) {
+ Activator.trace("Master profile changed."); //$NON-NLS-1$
+ Activator.trace("Performing reconciliation."); //$NON-NLS-1$
+ return false;
+ }
+
// read timestamps
Properties timestamps = readTimestamps();
if (timestamps.isEmpty()) {
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 d2504c1..cf3feb3 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
@@ -56,7 +56,7 @@ public class ProfileSynchronizer {
private static final String PIPE = "|"; //$NON-NLS-1$
private static final String EXPLANATION = "org.eclipse.equinox.p2.director.explain"; //$NON-NLS-1$
- private static final String PROP_IGNORE_USER_CONFIGURATION = "eclipse.ignoreUserConfiguration"; //$NON-NLS-1$
+ static final String PROP_IGNORE_USER_CONFIGURATION = "eclipse.ignoreUserConfiguration"; //$NON-NLS-1$
final IProfile profile;