summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2013-05-26 17:22:52 (EDT)
committerPascal Rapicault2013-05-26 17:22:52 (EDT)
commit533b004da27980dc5be3b56dee63d51d34dc2685 (patch)
tree066e51c1da37cca7fc65c0b318bedb26ceec2a37
parentfc958e5370b322d44ad3a807091617cf7d73545b (diff)
downloadrt.equinox.p2-533b004da27980dc5be3b56dee63d51d34dc2685.zip
rt.equinox.p2-533b004da27980dc5be3b56dee63d51d34dc2685.tar.gz
rt.equinox.p2-533b004da27980dc5be3b56dee63d51d34dc2685.tar.bz2
Revert "Bug 408138 - Dropins are broken in after master configuration change"I20130526-2000
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java16
1 files changed, 0 insertions, 16 deletions
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
index 0fb0ecc..8d55e00 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
@@ -7,7 +7,6 @@
* Contributors:
* IBM Corporation - initial API and implementation
* Ericsson AB - ongoing development
- * Red Hat, Inc. - Bug 408138
******************************************************************************/
package org.eclipse.equinox.internal.p2.engine;
@@ -39,7 +38,6 @@ import org.xml.sax.SAXException;
public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
- private static final String PROP_IGNORE_USER_CONFIGURATION = "eclipse.ignoreUserConfiguration"; //$NON-NLS-1$
private static final String SIMPLE_PROFILE_REGISTRY_INTERNAL = "_simpleProfileRegistry_internal_"; //$NON-NLS-1$
private static final String PROFILE_REGISTRY = "profile registry"; //$NON-NLS-1$
private static final String PROFILE_PROPERTIES_FILE = "state.properties"; //$NON-NLS-1$
@@ -265,14 +263,6 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
internalSetProfileStateProperty(profile, profile.getTimestamp(), IProfile.STATE_PROP_SHARED_INSTALL, IProfile.STATE_SHARED_INSTALL_VALUE_NEW);
internalSetProfileStateProperty(profile, profile.getTimestamp(), SIMPLE_PROFILE_REGISTRY_INTERNAL + getBaseTimestamp(profile.getProfileId()), getBaseTimestamp(id));
agent.registerService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP, Long.toString(profile.getTimestamp()));
-
- // this looks like a hack, but:
- // (1) SimpleConfigurationImpl keeps returning master configuration as long as the property is set
- // (2) SimpleConfigurationImpl sets the propery after it drops user configuration
- // therefore dropins reconciliation can't load dropins plugins installed into user configuration
- // after the user configuration has been dropped.
- // It is necessary to unset this property.
- System.setProperty(PROP_IGNORE_USER_CONFIGURATION, "processed_and_unset"); //$NON-NLS-1$ //$NON-NLS-2$
} else {
//This is the first time we create the shared profile. Tag it as such and also remember the timestamp of the base
internalSetProfileStateProperty(profile, profile.getTimestamp(), IProfile.STATE_PROP_SHARED_INSTALL, IProfile.STATE_SHARED_INSTALL_VALUE_INITIAL);
@@ -289,12 +279,6 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
if (agent.getService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP) != null)
return false;
- // if the property is set by OSGI, and there is no new timestamp (because of the previous condition)
- // ignore current profile. This will happen only once, because SERVICE_SHARED_INSTALL_NEW_TIMESTAMP
- // is set during profile reset.
- if ("true".equals(System.getProperty(PROP_IGNORE_USER_CONFIGURATION))) //$NON-NLS-1$ //$NON-NLS-2$
- return true;
-
String baseTimestamp = getBaseTimestamp(profile.getProfileId());
if (baseTimestamp == null)
return false;