jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

commit: rephrase the error messages more understandable 

fixes #10703
cute-signatures
Timo Teräs 2020-10-03 13:57:05 +03:00
parent c269e9c24d
commit 8a794021c4
17 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/commit.c
View File

@ -540,7 +540,7 @@ static void analyze_name(struct print_state *ps, struct apk_name *name)
} }
label_end(ps); label_end(ps);
} else { } else {
snprintf(tmp, sizeof(tmp), "%s (missing)", name->name); snprintf(tmp, sizeof(tmp), "%s (no such package)", name->name);
ps->label = tmp; ps->label = tmp;
} }
@ -637,7 +637,7 @@ void apk_solver_print_errors(struct apk_database *db,
* any other selected version. or all of them with -v. * any other selected version. or all of them with -v.
*/ */
apk_error("unsatisfiable constraints:"); apk_error("unable to select packages:");
/* Construct information about names */ /* Construct information about names */
foreach_array_item(change, changeset->changes) { foreach_array_item(change, changeset->changes) {

2
test/basic12.test
View File

@ -6,7 +6,7 @@
--latest --latest
upgrade upgrade
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
b-2: b-2:
masked in: --no-network masked in: --no-network
satisfies: a-2[b] satisfies: a-2[b]

2
test/basic13.test
View File

@ -5,6 +5,6 @@
--latest --latest
upgrade upgrade
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
a-2: a-2:
breaks: world[a<2] breaks: world[a<2]

2
test/conflict2.test
View File

@ -2,7 +2,7 @@
--test-repo conflict.repo --test-repo conflict.repo
add a b>1 add a b>1
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
b-2: b-2:
breaks: a-1[!b>1] breaks: a-1[!b>1]
satisfies: world[b>1] satisfies: world[b>1]

2
test/error1.test
View File

@ -2,7 +2,7 @@
--test-repo complicated1.repo --test-repo complicated1.repo
add a d>1.5 add a d>1.5
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
d-2.0: d-2.0:
breaks: b-1[d<2.0] breaks: b-1[d<2.0]
satisfies: world[d>1.5] a-3[d>1.5] c-1[d>1.0] satisfies: world[d>1.5] a-3[d>1.5] c-1[d>1.0]

2
test/error2.test
View File

@ -2,7 +2,7 @@
--test-repo complicated1.repo --test-repo complicated1.repo
add a d<1.5 add a d<1.5
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
d-1.0: d-1.0:
breaks: c-1[d>1.0] breaks: c-1[d>1.0]
satisfies: world[d<1.5] b-1[d<2.0] satisfies: world[d<1.5] b-1[d<2.0]

2
test/error3.test
View File

@ -2,7 +2,7 @@
--test-repo complicated1.repo --test-repo complicated1.repo
add a !b add a !b
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
d-2.0: d-2.0:
breaks: b-1[d<2.0] breaks: b-1[d<2.0]
satisfies: a-3[d>1.5] c-1[d>1.0] satisfies: a-3[d>1.5] c-1[d>1.0]

4
test/error4.test
View File

@ -2,6 +2,6 @@
--test-repo complicated1.repo --test-repo complicated1.repo
add a nonexistant add a nonexistant
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
nonexistant (missing): nonexistant (no such package):
required by: world[nonexistant] required by: world[nonexistant]

2
test/error5.test
View File

@ -2,7 +2,7 @@
--test-repo complicated1.repo --test-repo complicated1.repo
add a>2 add a>2
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
d-2.0: d-2.0:
breaks: b-1[d<2.0] breaks: b-1[d<2.0]
satisfies: a-3[d>1.5] c-1[d>1.0] satisfies: a-3[d>1.5] c-1[d>1.0]

2
test/pinning11.test
View File

@ -4,7 +4,7 @@
--test-world "a@testing" --test-world "a@testing"
add c>=3 add c>=3
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
c-3: c-3:
masked in: @testing masked in: @testing
satisfies: world[c>=3] satisfies: world[c>=3]

2
test/provides10.test
View File

@ -3,7 +3,7 @@
--test-repo provides.repo --test-repo provides.repo
add conflicted-dep add conflicted-dep
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
conflicted-provider (virtual): conflicted-provider (virtual):
provided by: conflicted-provider-a provided by: conflicted-provider-a
conflicted-provider-b conflicted-provider-b

2
test/provides11.test
View File

@ -3,7 +3,7 @@
--test-repo provides.repo --test-repo provides.repo
add conflicted-parent add conflicted-parent
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
conflicted-provider (virtual): conflicted-provider (virtual):
provided by: conflicted-provider-a provided by: conflicted-provider-a
conflicted-provider-b conflicted-provider-b

2
test/provides12.test
View File

@ -2,7 +2,7 @@
--test-repo provides.repo --test-repo provides.repo
add self-provide add self-provide
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
self-provide-0.1: self-provide-0.1:
conflicts: self-provide-0.1[self-provide] conflicts: self-provide-0.1[self-provide]
satisfies: world[self-provide] satisfies: world[self-provide]

2
test/provides5.test
View File

@ -2,7 +2,7 @@
--test-repo provides.repo --test-repo provides.repo
add server-a server-b add server-a server-b
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
server-a-1: server-a-1:
conflicts: server-b-1[theservice=1] conflicts: server-b-1[theservice=1]
satisfies: world[server-a] satisfies: world[server-a]

2
test/provides6.test
View File

@ -2,7 +2,7 @@
--test-repo provides.repo --test-repo provides.repo
add app app2 add app app2
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
libfoo-1: libfoo-1:
conflicts: libfoo-2 conflicts: libfoo-2
satisfies: app-2[so:foo.so.1] satisfies: app-2[so:foo.so.1]

2
test/provides7.test
View File

@ -2,7 +2,7 @@
--test-repo provides.repo --test-repo provides.repo
add selfconflicting add selfconflicting
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
selfconflicting-1: selfconflicting-1:
conflicts: selfconflicting-1[selfprovided=2] conflicts: selfconflicting-1[selfprovided=2]
selfconflicting-1[selfprovided=3] selfconflicting-1[selfprovided=3]

2
test/provides9.test
View File

@ -2,7 +2,7 @@
--test-repo provides.repo --test-repo provides.repo
add conflicted-provider add conflicted-provider
@EXPECT @EXPECT
ERROR: unsatisfiable constraints: ERROR: unable to select packages:
conflicted-provider (virtual): conflicted-provider (virtual):
provided by: conflicted-provider-a provided by: conflicted-provider-a
conflicted-provider-b conflicted-provider-b