svn commit: r269938 - stable/9/usr.sbin/pkg

[Gavin Atkinson]

Author: gavin
Date: Wed Aug 13 12:45:25 2014
New Revision: 269938
URL: http://svnweb.freebsd.org/changeset/base/269938

Log:
  Merge r268728 from head:
  
    When we fail to extract the pkg binaries (for example, / is read-only),
    give a more helpful error message.

Modified:
  stable/9/usr.sbin/pkg/pkg.c
Directory Properties:
  stable/9/usr.sbin/pkg/   (props changed)

Modified: stable/9/usr.sbin/pkg/pkg.c
==============================================================================
--- stable/9/usr.sbin/pkg/pkg.c	Wed Aug 13 12:44:44 2014	(r269937)
+++ stable/9/usr.sbin/pkg/pkg.c	Wed Aug 13 12:45:25 2014	(r269938)
@@ -126,7 +126,8 @@ extract_pkg_static(int fd, char *p, int 
 	if (r == ARCHIVE_OK)
 		ret = 0;
 	else
-		warnx("fail to extract pkg-static");
+		warnx("failed to extract pkg-static: %s",
+		    archive_error_string(a));
 
 cleanup:
 	archive_read_free(a);