summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2013-01-23 15:26:41 (EST)
committerPascal Rapicault2013-01-23 15:26:41 (EST)
commit5243d497142b0f2631bcda8b5fed67d7ce0ddbd5 (patch)
tree5f696d0309e977a329be2731116a0519516b0454
parent12eccdad23420e7ba91f99221c852f7e32eb11de (diff)
downloadrt.equinox.p2-5243d497142b0f2631bcda8b5fed67d7ce0ddbd5.zip
rt.equinox.p2-5243d497142b0f2631bcda8b5fed67d7ce0ddbd5.tar.gz
rt.equinox.p2-5243d497142b0f2631bcda8b5fed67d7ce0ddbd5.tar.bz2
always use shared install when the ignoreUserConfig property is set
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java
index ba07518..d7b2c4b 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java
@@ -99,6 +99,9 @@ public class SimpleConfiguratorImpl implements Configurator {
if (!sharedConfig.exists())
return userConfig.toURL();
+ if (Boolean.TRUE.toString().equals(System.getProperty(PROP_IGNORE_USER_CONFIGURATION)))
+ return sharedConfig.toURL();
+
long sharedBundlesInfoTimestamp = getCurrentBundlesInfoBaseTimestamp(sharedConfig);
long lastKnownBaseTimestamp = getLastKnownBundlesInfoBaseTimestamp(userConfig.getParentFile());