summaryrefslogtreecommitdiff
path: root/test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2020-06-19 13:14:33 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2020-07-02 18:57:11 +0200
commit3e39efa31da463ca05016513835d9a5388f80f90 (patch)
tree6d15cc8cf75f3bffe05e698f8b96625c0bc42787 /test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict
parent289ee74dd23cba7e08b08c6c3602bcf4bf8167bc (diff)
Delay removals due to Conflicts until Depends are resolved
Marking a package for removal is fine if we know that we have to remove that package, but if we are in an alternative branch we might not go this route in the end and hence have a package pointlessly marked for removal which isn't questioned later on. We check if we are allowed to remove that package to avoid working on the positive dependencies if not, but we mark them for removal only after all the other dependencies are successfully resolved. In an ideal world we would let the problemResolver do its job on them, but the resolver might decide against doing the removal exploring another option like the next alternative, which might be a good idea, but is not the behaviour we had before, so that is the best we can do for now without changing the resolver drastically.
Diffstat (limited to 'test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict')
-rwxr-xr-xtest/integration/test-bug-960705-propagate-protected-to-satisfied-conflict2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict b/test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict
index e793193c3..ad1501b66 100755
--- a/test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict
+++ b/test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict
@@ -17,7 +17,7 @@ setupaptarchive
testsuccessequal "Reading package lists...
Building dependency tree...
- Removing: systemd-sysv as upgrade is not an option for runit-init:amd64 (1)
+ Removing: systemd-sysv:amd64 as upgrade is not an option for runit-init:amd64 (1)
MarkDelete systemd-sysv:amd64 < 1 @ii mK > FU=0
MarkInstall runit-init:amd64 < none -> 1 @un puN > FU=1
Starting pkgProblemResolver with broken count: 1