Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2009-09-23 19:54:45 +0000
committerAndrew Niefer2009-09-23 19:54:45 +0000
commit904218cc7294f09026c2e2ed51b26de5a3c1c56e (patch)
treed751fb3cd34896c3da26eb51a97c0493e0d37d47 /bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository
parentdda41c7d886f47b5cfabf1b38a089fdef1fcca51 (diff)
downloadrt.equinox.p2-904218cc7294f09026c2e2ed51b26de5a3c1c56e.tar.gz
rt.equinox.p2-904218cc7294f09026c2e2ed51b26de5a3c1c56e.tar.xz
rt.equinox.p2-904218cc7294f09026c2e2ed51b26de5a3c1c56e.zip
bug 289345 - repo2runnable stops when some IUs are missing
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository')
-rw-r--r--bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/Repo2Runnable.java15
1 files changed, 9 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/Repo2Runnable.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/Repo2Runnable.java
index 3a2f3d141..69e6ba59e 100644
--- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/Repo2Runnable.java
+++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/Repo2Runnable.java
@@ -110,7 +110,7 @@ public class Repo2Runnable extends AbstractApplication implements IApplication {
* Perform the transformation.
*/
public IStatus run(IProgressMonitor monitor) throws ProvisionException {
- SubMonitor progress = SubMonitor.convert(monitor, 4);
+ SubMonitor progress = SubMonitor.convert(monitor, 5);
initializeRepos(progress);
@@ -130,13 +130,12 @@ public class Repo2Runnable extends AbstractApplication implements IApplication {
IProfile profile = createProfile();
try {
ProvisioningContext context = new ProvisioningContext();
- PhaseSet phaseSet = getPhaseSet();
Engine engine = (Engine) ServiceHelper.getService(Activator.getBundleContext(), IEngine.SERVICE_NAME);
if (engine == null)
throw new ProvisionException(Messages.exception_noEngineService);
- IStatus result = engine.perform(profile, phaseSet, operands, context, progress.newChild(1));
- if (result.matches(IStatus.ERROR))
- return result;
+
+ IStatus result = engine.perform(profile, getPhaseSet(), operands, context, progress.newChild(1));
+ engine.perform(profile, getNativePhase(), operands, context, progress.newChild(1));
// publish the metadata to a destination - if requested
publishMetadata(progress.newChild(1));
@@ -151,7 +150,11 @@ public class Repo2Runnable extends AbstractApplication implements IApplication {
}
protected PhaseSet getPhaseSet() {
- return new PhaseSet(new Phase[] {new Collect(100), new CollectNativesPhase(100)}) { /* nothing to override */};
+ return new PhaseSet(new Phase[] {new Collect(100)}) { /* nothing to override */};
+ }
+
+ protected PhaseSet getNativePhase() {
+ return new PhaseSet(new Phase[] {new CollectNativesPhase(100)}) { /*nothing to override */};
}
/*

Back to the top