From 1fb1afc5c25830c6914789d7b427c9ffdf88a24e Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Wed, 17 Aug 2011 16:55:35 +0300 Subject: 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 --- test/basic1.expect | 2 +- test/basic3.expect | 2 +- test/basic5.expect | 2 +- test/complicated1.expect | 6 +++--- test/complicated2.expect | 4 ++-- test/complicated3.expect | 2 +- test/complicated4.expect | 6 +++--- test/installif1.expect | 4 ++++ test/installif1.repo | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ test/installif1.test | 2 ++ test/installif2.expect | 6 ++++++ test/installif2.test | 2 ++ test/installif3.expect | 4 ++++ test/installif3.test | 2 ++ 14 files changed, 80 insertions(+), 12 deletions(-) create mode 100644 test/installif1.expect create mode 100644 test/installif1.repo create mode 100644 test/installif1.test create mode 100644 test/installif2.expect create mode 100644 test/installif2.test create mode 100644 test/installif3.expect create mode 100644 test/installif3.test (limited to 'test') diff --git a/test/basic1.expect b/test/basic1.expect index a6cf8f2..81756fe 100644 --- a/test/basic1.expect +++ b/test/basic1.expect @@ -1,2 +1,2 @@ -Installing a (2) Installing b (2) +Installing a (2) diff --git a/test/basic3.expect b/test/basic3.expect index 1764c4a..73bef16 100644 --- a/test/basic3.expect +++ b/test/basic3.expect @@ -1,2 +1,2 @@ -Upgrading a (1 -> 2) Upgrading b (1 -> 2) +Upgrading a (1 -> 2) diff --git a/test/basic5.expect b/test/basic5.expect index 269ff0c..b29db17 100644 --- a/test/basic5.expect +++ b/test/basic5.expect @@ -1,2 +1,2 @@ -Replacing a (2 -> 2) Replacing b (2 -> 2) +Replacing a (2 -> 2) diff --git a/test/complicated1.expect b/test/complicated1.expect index e3ad04d..1387f53 100644 --- a/test/complicated1.expect +++ b/test/complicated1.expect @@ -1,4 +1,4 @@ -Installing a (2) -Installing b (1) -Installing c (1) Installing d (1.5) +Installing c (1) +Installing b (1) +Installing a (2) diff --git a/test/complicated2.expect b/test/complicated2.expect index bfaa5ab..5261d10 100644 --- a/test/complicated2.expect +++ b/test/complicated2.expect @@ -1,3 +1,3 @@ -Installing b (1) -Installing c (1) Installing d (1.5) +Installing c (1) +Installing b (1) diff --git a/test/complicated3.expect b/test/complicated3.expect index 81c21cb..e9b2733 100644 --- a/test/complicated3.expect +++ b/test/complicated3.expect @@ -1,2 +1,2 @@ -Installing c (1) Installing d (2.0) +Installing c (1) diff --git a/test/complicated4.expect b/test/complicated4.expect index dc96f6e..44964e3 100644 --- a/test/complicated4.expect +++ b/test/complicated4.expect @@ -1,4 +1,4 @@ -Installing a (2) -Installing b (1) -Installing c (1) Upgrading d (1.0 -> 1.5) +Installing c (1) +Installing b (1) +Installing a (2) diff --git a/test/installif1.expect b/test/installif1.expect new file mode 100644 index 0000000..d9ee058 --- /dev/null +++ b/test/installif1.expect @@ -0,0 +1,4 @@ +Installing foo (1) +Installing lib (1) +Installing app (1) +Installing appiif1 (1) diff --git a/test/installif1.repo b/test/installif1.repo new file mode 100644 index 0000000..09b6760 --- /dev/null +++ b/test/installif1.repo @@ -0,0 +1,48 @@ +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 + diff --git a/test/installif1.test b/test/installif1.test new file mode 100644 index 0000000..99e139a --- /dev/null +++ b/test/installif1.test @@ -0,0 +1,2 @@ +--raw-repository installif1.repo +foo app diff --git a/test/installif2.expect b/test/installif2.expect new file mode 100644 index 0000000..0cd5d31 --- /dev/null +++ b/test/installif2.expect @@ -0,0 +1,6 @@ +Installing foo (1) +Installing lib (1) +Installing app (1) +Installing appiif1 (1) +Installing bar (1) +Installing appiif2 (1) diff --git a/test/installif2.test b/test/installif2.test new file mode 100644 index 0000000..f4f68f5 --- /dev/null +++ b/test/installif2.test @@ -0,0 +1,2 @@ +--raw-repository installif1.repo +foo app bar diff --git a/test/installif3.expect b/test/installif3.expect new file mode 100644 index 0000000..d9ee058 --- /dev/null +++ b/test/installif3.expect @@ -0,0 +1,4 @@ +Installing foo (1) +Installing lib (1) +Installing app (1) +Installing appiif1 (1) diff --git a/test/installif3.test b/test/installif3.test new file mode 100644 index 0000000..881b664 --- /dev/null +++ b/test/installif3.test @@ -0,0 +1,2 @@ +--raw-repository installif1.repo --raw-repository installif2.repo +foo app -- cgit v1.2.3-70-g09d2