summaryrefslogtreecommitdiff
path: root/test/conflict2.test
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-06-13 18:20:39 +0300
committerTimo Teräs <timo.teras@iki.fi>2013-06-13 18:22:00 +0300
commite51232e710dfd32764e2c2d0599df83ab85a9c74 (patch)
tree5eac93c05cf2fe77d2857a48a9fc55c7bf7e33d0 /test/conflict2.test
parent25ff68a87e3264b6dfdc846823d4912b4dd870b2 (diff)
downloadapk-tools-e51232e710dfd32764e2c2d0599df83ab85a9c74.tar.gz
apk-tools-e51232e710dfd32764e2c2d0599df83ab85a9c74.tar.bz2
apk-tools-e51232e710dfd32764e2c2d0599df83ab85a9c74.tar.xz
apk-tools-e51232e710dfd32764e2c2d0599df83ab85a9c74.zip
errors: rewrite the logic how errors are reported
Instead of the dependency oriented logic, switch to print them for each package or name needed. Might give a bit more readable errors now. There's still few corner cases that proper error is not output, which are cought by the test cases.
Diffstat (limited to 'test/conflict2.test')
-rw-r--r--test/conflict2.test6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/conflict2.test b/test/conflict2.test
index c9f59ec..38566b6 100644
--- a/test/conflict2.test
+++ b/test/conflict2.test
@@ -2,5 +2,7 @@
--test-repo conflict.repo
add a b>1
@EXPECT
-ERROR: unsatisfiable dependencies:
- world: b>1
+ERROR: unsatisfiable constraints:
+ b-2:
+ breaks: a-1[!b>1]
+ satisfies: world[b>1]