d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg: Provide a friendlier message when bootstrap fails due to address resolution

Browse Source 
The current message when bootstapping pkg fails for any reason implies that pkg
is not available. We have the error code from fetch so if bootstrap failed due
to address resolution say so.

Reviewed by:    bapt, bz
Approved by:    bz (co-mentor)
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D25323
This commit is contained in:
thj 2020-06-23 15:14:54 +00:00
parent f58c62b7a0
commit 4a2a56b26b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/pkg/pkg.c
View File

@ -915,10 +915,15 @@ bootstrap_pkg(bool force)
fetchfail:
warnx("Error fetching %s: %s", url, fetchLastErrString);
fprintf(stderr, "A pre-built version of pkg could not be found for "
"your system.\n");
fprintf(stderr, "Consider changing PACKAGESITE or installing it from "
"ports: 'ports-mgmt/pkg'.\n");
if (fetchLastErrCode == FETCH_RESOLV) {
fprintf(stderr, "Address resolution failed for %s.\n", packagesite);
fprintf(stderr, "Consider changing PACKAGESITE.\n");
} else {
fprintf(stderr, "A pre-built version of pkg could not be found for "
"your system.\n");
fprintf(stderr, "Consider changing PACKAGESITE or installing it from "
"ports: 'ports-mgmt/pkg'.\n");
}
cleanup:
if (fd_sig != -1) {