diff options
| author | Julian Honnen | 2020-10-13 07:47:59 +0000 |
|---|---|---|
| committer | Julian Honnen | 2020-10-13 07:48:15 +0000 |
| commit | 1ceb63d03d1cb2c6060903b2cc9d1e4125ce3332 (patch) | |
| tree | 20c33350a3d2ec471cb9e2ed775501d46f60f9cf | |
| parent | f5eed9d4526800e7f43dcd3baedbf2655ae0db48 (diff) | |
| download | eclipse.pde.ui-1ceb63d03d1cb2c6060903b2cc9d1e4125ce3332.tar.gz eclipse.pde.ui-1ceb63d03d1cb2c6060903b2cc9d1e4125ce3332.tar.xz eclipse.pde.ui-1ceb63d03d1cb2c6060903b2cc9d1e4125ce3332.zip | |
Bug 567829 - restored -Dorg.eclipse.update.reconcile=false flag
VM Argument is still required for old targets to disable
update.configurator when simpleconfigurator is used.
Change-Id: I60ed38d3a48a14255ee15924bab3b2bd20b3b8d9
Signed-off-by: Julian Honnen <julian.honnen@vector.com>
| -rw-r--r-- | ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchConfigurationHelper.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchConfigurationHelper.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchConfigurationHelper.java index e5bbe928e4..9a34d2b339 100644 --- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchConfigurationHelper.java +++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchConfigurationHelper.java @@ -164,6 +164,11 @@ public class LaunchConfigurationHelper { // Add bundles.txt as p2 config data if (bundlesTxt != null) { properties.setProperty("org.eclipse.equinox.simpleconfigurator.configUrl", bundlesTxt.toString()); //$NON-NLS-1$ + if (bundles.get("org.eclipse.update.configurator") != null) { //$NON-NLS-1$ + // this argument is required as long as we support old target platforms containing o.e.update.configurator + // otherwise both simpleconfigurator and update.configurator will try to install bundles, slowing down launches. + properties.setProperty("org.eclipse.update.reconcile", "false"); //$NON-NLS-1$ //$NON-NLS-2$ + } } // Make the p2 data area in the configuration area itself, rather than a sibling of the configuration |