diff options
| author | Simon Kaegi | 2009-03-20 15:36:00 +0000 |
|---|---|---|
| committer | Simon Kaegi | 2009-03-20 15:36:00 +0000 |
| commit | 67af4425b9bbcd2661216b8dc836bcdf0c4de6cf (patch) | |
| tree | 14fad11a16eedbf6a905f634df509ceb0c3f6394 /bundles/org.eclipse.equinox.p2.installer | |
| parent | f90d8c68d7b5463a261c28eac7aed45349bac723 (diff) | |
| download | rt.equinox.p2-67af4425b9bbcd2661216b8dc836bcdf0c4de6cf.tar.gz rt.equinox.p2-67af4425b9bbcd2661216b8dc836bcdf0c4de6cf.tar.xz rt.equinox.p2-67af4425b9bbcd2661216b8dc836bcdf0c4de6cf.zip | |
Bug 269525 [installer] Stand-alone install uses installer p2.data.area
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.installer')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallApplication.java | 7 |
1 files changed, 6 insertions, 1 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 084d89d89..f48cb19bc 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 @@ -91,7 +91,7 @@ public class InstallApplication implements IApplication { String site = System.getProperty(SYS_PROP_INSTALL_DESCRIPTION); try { return InstallDescriptionParser.createDescription(site, monitor); - } catch (IOException e) { + } catch (Exception e) { throw fail(Messages.App_InvalidSite + site, e); } } @@ -211,6 +211,11 @@ public class InstallApplication implements IApplication { } //start up p2 try { + if (agentLocation != null) { + // reset the agent location + InstallerActivator.getDefault().getBundle("org.eclipse.equinox.p2.core").stop(Bundle.STOP_TRANSIENT); //$NON-NLS-1$ + InstallerActivator.getDefault().getBundle("org.eclipse.equinox.p2.core").start(Bundle.START_TRANSIENT); //$NON-NLS-1$ + } InstallerActivator.getDefault().getBundle("org.eclipse.equinox.p2.exemplarysetup").start(Bundle.START_TRANSIENT); //$NON-NLS-1$ } catch (BundleException e) { throw fail(Messages.App_FailedStart, e); |