summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2013-04-03 09:53:43 (EDT)
committerPascal Rapicault2013-04-03 09:53:43 (EDT)
commitc3069d2239f60055a889b8b7bd033e97f2a6e2e1 (patch)
tree05a17018dffb198a06e57bb50c0b2bd4a90f538d
parent46107af7509738d227327b7a9da0f01cb242852e (diff)
downloadrt.equinox.p2-c3069d2239f60055a889b8b7bd033e97f2a6e2e1.zip
rt.equinox.p2-c3069d2239f60055a889b8b7bd033e97f2a6e2e1.tar.gz
rt.equinox.p2-c3069d2239f60055a889b8b7bd033e97f2a6e2e1.tar.bz2
Bug 404279 - dropins and links folders broken in N-builds
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
index ba401bb..092b710 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
@@ -991,7 +991,7 @@ public class Projector {
backToIU();
long stop = System.currentTimeMillis();
if (DEBUG)
- Tracing.debug("Solver solution found in: " + (stop - start) + " ms."); //$NON-NLS-1$
+ Tracing.debug("Solver solution found in: " + (stop - start) + " ms."); //$NON-NLS-1$ //$NON-NLS-2$
} else {
long stop = System.currentTimeMillis();
if (DEBUG) {
@@ -1013,7 +1013,9 @@ public class Projector {
private void backToIU() {
solution = new ArrayList<IInstallableUnit>();
- //TODO WORK AROUND BECAUE OF A BUG IN SAT4J
+ // TODO WORK AROUND BECAUE OF A BUG IN SAT4J
+ if (!userDefinedFunction)
+ dependencyHelper.getSolutionCost();
IVec<Object> sat4jSolution = dependencyHelper.getSolution();
for (Iterator<Object> iter = sat4jSolution.iterator(); iter.hasNext();) {
Object var = iter.next();