Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2010-05-14 21:22:51 +0000
committerPascal Rapicault2010-05-14 21:22:51 +0000
commit0501f8100d68298830a349b2438dbbd7e8703fbf (patch)
tree11ed1c7f5a7f610410d5f2a56f980df3b6b11266
parent55007022e33a4af56b0c5904c743516feb75e043 (diff)
downloadrt.equinox.p2-0501f8100d68298830a349b2438dbbd7e8703fbf.tar.gz
rt.equinox.p2-0501f8100d68298830a349b2438dbbd7e8703fbf.tar.xz
rt.equinox.p2-0501f8100d68298830a349b2438dbbd7e8703fbf.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/DirectorApplication.java16
1 files changed, 0 insertions, 16 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/DirectorApplication.java b/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/DirectorApplication.java
index 2edc2d9a0..8f400a55f 100644
--- a/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/DirectorApplication.java
+++ b/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/DirectorApplication.java
@@ -231,8 +231,6 @@ public class DirectorApplication implements IApplication {
private IProvisioningAgent targetAgent;
private boolean noArtifactRepositorySpecified = false;
- private long newProfile = -1;
-
private ProfileChangeRequest buildProvisioningRequest(IProfile profile, Collection<IInstallableUnit> installs, Collection<IInstallableUnit> uninstalls) {
ProfileChangeRequest request = new ProfileChangeRequest(profile);
markRoots(request, installs);
@@ -353,7 +351,6 @@ public class DirectorApplication implements IApplication {
if (profileProperties != null)
putProperties(profileProperties, props);
profile = ((IProfileRegistry) targetAgent.getService(IProfileRegistry.SERVICE_NAME)).addProfile(profileId, props);
- newProfile = profile.getTimestamp();
}
return profile;
}
@@ -551,7 +548,6 @@ public class DirectorApplication implements IApplication {
ProfileChangeRequest request = buildProvisioningRequest(profile, installs, uninstalls);
printRequest(request);
planAndExecute(profile, context, request);
- removeJunkProfile(profile);
} finally {
// if we were originally were set to be roaming and we changed it, change it back before we return
if (wasRoaming && !Boolean.valueOf(profile.getProperty(IProfile.PROP_ROAMING)).booleanValue())
@@ -559,18 +555,6 @@ public class DirectorApplication implements IApplication {
}
}
- private void removeJunkProfile(IProfile profile) {
- if (newProfile == -1)
- return;
-
- //Remove the initial profile entry that is created when the profile is first created during a provisioning operation
- try {
- ((IProfileRegistry) targetAgent.getService(IProfileRegistry.SERVICE_NAME)).removeProfile(profile.getProfileId(), newProfile);
- } catch (ProvisionException e) {
- LogHelper.log(new Status(IStatus.OK, Activator.ID, NLS.bind(Messages.could_not_remove_initialProfile, profile.getProfileId())));
- }
- }
-
private void planAndExecute(IProfile profile, ProvisioningContext context, ProfileChangeRequest request) throws CoreException {
IProvisioningPlan result = planner.getProvisioningPlan(request, context, new NullProgressMonitor());
IStatus operationStatus = result.getStatus();

Back to the top