summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2022-02-24 14:15:28 +0200
committerTimo Teräs <timo.teras@iki.fi>2022-02-24 14:36:24 +0200
commit3b013f458225c2ad8a0d96ec3eb3dde2533e0312 (patch)
treeabf3333c86704952cd9ae9e7b49e8d05192026b5 /test
parentcfe72c6fc4770c0bfba48660d88c65f0f923e479 (diff)
downloadapk-tools-3b013f458225c2ad8a0d96ec3eb3dde2533e0312.tar.gz
apk-tools-3b013f458225c2ad8a0d96ec3eb3dde2533e0312.tar.bz2
apk-tools-3b013f458225c2ad8a0d96ec3eb3dde2533e0312.tar.xz
apk-tools-3b013f458225c2ad8a0d96ec3eb3dde2533e0312.zip
solver: do not auto select virtual-only package with one provider
This reverts most of 0dcbd933 which allowed automatic selection of package with a "virtual provides" having only one provider. While convenient, it creates problems if multiple versions of the same package exist, or if in future other providers would be added to one of the repositories. This restore the original behaviour, and improve the error message to tell the user to mention one of the providers explicitly. fixes #10810
Diffstat (limited to 'test')
-rw-r--r--test/provides10.test2
-rw-r--r--test/provides11.test2
-rw-r--r--test/provides9.test2
3 files changed, 6 insertions, 0 deletions
diff --git a/test/provides10.test b/test/provides10.test
index c832b75..91bf295 100644
--- a/test/provides10.test
+++ b/test/provides10.test
@@ -5,6 +5,8 @@ add conflicted-dep
@EXPECT
ERROR: unable to select packages:
conflicted-provider (virtual):
+ note: please select one of the 'provided by'
+ packages explicitly
provided by: conflicted-provider-a
conflicted-provider-b
required by: conflicted-dep-0.1[conflicted-provider]
diff --git a/test/provides11.test b/test/provides11.test
index 54c6b34..c48c33c 100644
--- a/test/provides11.test
+++ b/test/provides11.test
@@ -5,6 +5,8 @@ add conflicted-parent
@EXPECT
ERROR: unable to select packages:
conflicted-provider (virtual):
+ note: please select one of the 'provided by'
+ packages explicitly
provided by: conflicted-provider-a
conflicted-provider-b
required by: conflicted-dep-0.1[conflicted-provider]
diff --git a/test/provides9.test b/test/provides9.test
index ce45a15..8df1bc8 100644
--- a/test/provides9.test
+++ b/test/provides9.test
@@ -4,6 +4,8 @@ add conflicted-provider
@EXPECT
ERROR: unable to select packages:
conflicted-provider (virtual):
+ note: please select one of the 'provided by'
+ packages explicitly
provided by: conflicted-provider-a
conflicted-provider-b
required by: world[conflicted-provider]