Get 'all met' right for multiple deps in cycles

Fixes: ticket:1003

3 files changed, 60 insertions, 0 deletions

diff --git a/paludis/resolver/nag.cc b/paludis/resolver/nag.cc
index e064548a8..a76d42e4d 100644
--- a/paludis/resolver/nag.cc
+++ b/paludis/resolver/nag.cc
@@ -470,7 +470,9 @@ NAGEdgeProperties &
 NAGEdgeProperties::operator|= (const NAGEdgeProperties & other)
 {
     build() |= other.build();
+    build_all_met() &= other.build_all_met();
     run() |= other.run();
+    run_all_met() &= other.run_all_met();
     return *this;
 }
 
diff --git a/paludis/resolver/resolver_TEST_cycles.cc b/paludis/resolver/resolver_TEST_cycles.cc
index 75e55d99f..3aa2998ac 100644
--- a/paludis/resolver/resolver_TEST_cycles.cc
+++ b/paludis/resolver/resolver_TEST_cycles.cc
@@ -365,5 +365,36 @@ namespace test_cases
                     );
         }
     } test_cycle_deps;
+
+    struct TestBuildAgainstBlock : ResolverCyclesTestCase
+    {
+        TestBuildAgainstBlock() :
+            ResolverCyclesTestCase("build against block")
+        {
+        }
+
+        void run()
+        {
+            std::shared_ptr<const Resolved> resolved(get_resolved("build-against-block/target"));
+
+            check_resolved(resolved,
+                    n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+                        .change(QualifiedPackageName("build-against-block/dep-b"))
+                        .change(QualifiedPackageName("build-against-block/dep-a"))
+                        .change(QualifiedPackageName("build-against-block/target"))
+                        .finished()),
+                    n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
+                        .finished()),
+                    n::taken_unconfirmed_decisions() = make_shared_copy(DecisionChecks()
+                        .finished()),
+                    n::taken_unorderable_decisions() = make_shared_copy(DecisionChecks()
+                        .finished()),
+                    n::untaken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+                        .finished()),
+                    n::untaken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
+                        .finished())
+                    );
+        }
+    } test_build_against_block;
 }
 
diff --git a/paludis/resolver/resolver_TEST_cycles_setup.sh b/paludis/resolver/resolver_TEST_cycles_setup.sh
index 086ec12c6..814c164a2 100755
--- a/paludis/resolver/resolver_TEST_cycles_setup.sh
+++ b/paludis/resolver/resolver_TEST_cycles_setup.sh
@@ -255,5 +255,32 @@ SLOT="0"
 DEPENDENCIES="build: cycle-deps/dep-c"
 END
 
+# build-against-block
+echo 'build-against-block' >> metadata/categories.conf
+
+mkdir -p 'packages/build-against-block/target'
+cat <<END > packages/build-against-block/target/target-1.exheres-0
+SUMMARY="target"
+PLATFORMS="test"
+SLOT="0"
+DEPENDENCIES="build-against-block/dep-a"
+END
+
+mkdir -p 'packages/build-against-block/dep-a'
+cat <<END > packages/build-against-block/dep-a/dep-a-2.exheres-0
+SUMMARY="dep"
+PLATFORMS="test"
+SLOT="0"
+DEPENDENCIES="build+run: !build-against-block/dep-b[<2] build-against-block/dep-b[~2]"
+END
+
+mkdir -p 'packages/build-against-block/dep-b'
+cat <<END > packages/build-against-block/dep-b/dep-b-2.exheres-0
+SUMMARY="dep"
+PLATFORMS="test"
+SLOT="0"
+DEPENDENCIES="!build-against-block/dep-a[<2]"
+END
+
 cd ..