svn commit: r362541 - head/usr.sbin/pkg

[Tom Jones]

Author: thj
Date: Tue Jun 23 15:14:54 2020
New Revision: 362541
URL: https://svnweb.freebsd.org/changeset/base/362541

Log:
  pkg: Provide a friendlier message when bootstrap fails due to address resolution
  
  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

Modified:
  head/usr.sbin/pkg/pkg.c

Modified: head/usr.sbin/pkg/pkg.c
==============================================================================
--- head/usr.sbin/pkg/pkg.c	Tue Jun 23 13:57:53 2020	(r362540)
+++ head/usr.sbin/pkg/pkg.c	Tue Jun 23 15:14:54 2020	(r362541)
@@ -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) {