Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2008-04-23 15:09:33 -0400
committerJohn Arthorne2008-04-23 15:09:33 -0400
commitf320619f53c9d5058830aec005e69065b0213e6b (patch)
treed7b3c19894f2d6ee711363a4347e7e2446a68560 /bundles
parent18195e5b5639a8ab30a12e9204ebeaf117b8989f (diff)
downloadrt.equinox.p2-f320619f53c9d5058830aec005e69065b0213e6b.tar.gz
rt.equinox.p2-f320619f53c9d5058830aec005e69065b0213e6b.tar.xz
rt.equinox.p2-f320619f53c9d5058830aec005e69065b0213e6b.zip
Bug 221700 Installer should use plugins directory as bundle pool location
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallApplication.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java1
2 files changed, 1 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallApplication.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallApplication.java
index e3b149ddc..7b4ce5d66 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallApplication.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallApplication.java
@@ -19,7 +19,6 @@ import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
import org.eclipse.equinox.internal.p2.installer.ui.SWTInstallAdvisor;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
import org.eclipse.equinox.internal.provisional.p2.installer.InstallAdvisor;
import org.eclipse.equinox.internal.provisional.p2.installer.InstallDescription;
import org.osgi.framework.Bundle;
@@ -194,11 +193,6 @@ public class InstallApplication implements IApplication {
if (agentArea == null || agentArea.length() == 0)
System.setProperty("eclipse.p2.data.area", agentLocation.toOSString()); //$NON-NLS-1$
}
- //set bundle pool location if specified
- IPath bundleLocation = description.getBundleLocation();
- if (bundleLocation != null && System.getProperty(IProfile.PROP_CACHE) == null)
- System.setProperty(IProfile.PROP_CACHE, bundleLocation.toString());
-
//start up p2
try {
InstallerActivator.getDefault().getBundle("org.eclipse.equinox.p2.exemplarysetup").start(Bundle.START_TRANSIENT); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java
index c0fcd51a9..772a218d6 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java
@@ -79,6 +79,7 @@ public class InstallUpdateProductOperation implements IInstallOperation {
String env = "osgi.os=" + info.getOS() + ",osgi.ws=" + info.getWS() + ",osgi.arch=" + info.getOSArch(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
properties.put(IProfile.PROP_ENVIRONMENTS, env);
properties.putAll(installDescription.getProfileProperties());
+ properties.put(IProfile.PROP_CACHE, installDescription.getBundleLocation().toOSString());
profile = profileRegistry.addProfile(getProfileId(), properties);
}
return profile;

Back to the top