solver: reintroduce install_if support

* each package name has two sorting positions, one which causes install_if triggers to be run, and other for bulk dependencies * fix also inverted ordering of package installations

solver: reintroduce install_if support
* each package name has two sorting positions, one which causes install_if triggers to be run, and other for bulk dependencies * fix also inverted ordering of package installations
1fb1afc5 · Timo Teräs · 48d368e7 · 1fb1afc5 · 1fb1afc5 · 1fb1afc5
Commit 1fb1afc5 authored Aug 17, 2011 by Timo Teräs
15 changed files
--- a/src/solver.c
+++ b/src/solver.c
--- a/test/basic1.expect
+++ b/test/basic1.expect
-Installing a (2)
 Installing b (2)
+Installing a (2)
--- a/test/basic3.expect
+++ b/test/basic3.expect
-Upgrading a (1 -> 2)
 Upgrading b (1 -> 2)
+Upgrading a (1 -> 2)
--- a/test/basic5.expect
+++ b/test/basic5.expect
-Replacing a (2 -> 2)
 Replacing b (2 -> 2)
+Replacing a (2 -> 2)
--- a/test/complicated1.expect
+++ b/test/complicated1.expect
-Installing a (2)
-Installing b (1)
-Installing c (1)
 Installing d (1.5)
+Installing c (1)
+Installing b (1)
+Installing a (2)
--- a/test/complicated2.expect
+++ b/test/complicated2.expect
-Installing b (1)
-Installing c (1)
 Installing d (1.5)
+Installing c (1)
+Installing b (1)
--- a/test/complicated3.expect
+++ b/test/complicated3.expect
-Installing c (1)
 Installing d (2.0)
+Installing c (1)
--- a/test/complicated4.expect
+++ b/test/complicated4.expect
-Installing a (2)
-Installing b (1)
-Installing c (1)
 Upgrading d (1.0 -> 1.5)
+Installing c (1)
+Installing b (1)
+Installing a (2)
--- a/test/installif1.expect
+++ b/test/installif1.expect
+Installing foo (1)
+Installing lib (1)
+Installing app (1)
+Installing appiif1 (1)
--- a/test/installif1.repo
+++ b/test/installif1.repo
+C:Q1EyN5AdpAOBJWKMR89pp/C66o+OE=
+P:app
+V:1
+S:1
+I:1
+D:lib
+
+C:Q1eVpkasfqZAukAXFYbgwt4xAMZWU=
+P:lib
+V:1
+S:1
+I:1
+
+C:Q1C4uoV7SdMdDhYg4OCVmI71D8HIA=
+P:foo
+V:1
+S:1
+I:1
+
+C:Q1hdUpqRv5mYgJEqW52UmVsvmyysF=
+P:bar
+V:1
+S:1
+I:1
+
+C:Q1hdUpqRv5mYgJEqW52UmVsvmyysE=
+P:libiif
+V:1
+S:1
+I:1
+i:lib foo
+
+C:Q16m4HrGizBiH4lG6Mxd5EL239L2U=
+P:appiif1
+V:1
+S:1
+I:1
+D:app
+i:app foo
+
+C:Q1/hQ3eH2AguTwJVGOz+keypXhXKY=
+P:appiif2
+V:1
+S:1
+I:1
+D:app
+i:app bar
+
--- a/test/installif1.test
+++ b/test/installif1.test
+--raw-repository installif1.repo
+foo app
--- a/test/installif2.expect
+++ b/test/installif2.expect
+Installing foo (1)
+Installing lib (1)
+Installing app (1)
+Installing appiif1 (1)
+Installing bar (1)
+Installing appiif2 (1)
--- a/test/installif2.test
+++ b/test/installif2.test
+--raw-repository installif1.repo
+foo app bar
--- a/test/installif3.expect
+++ b/test/installif3.expect
+Installing foo (1)
+Installing lib (1)
+Installing app (1)
+Installing appiif1 (1)
--- a/test/installif3.test
+++ b/test/installif3.test
+--raw-repository installif1.repo --raw-repository installif2.repo
+foo app