diff options
| author | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.sbin/pkg | |
| parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
| parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
| download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz | |
Merge head from 7/28
Diffstat (limited to 'usr.sbin/pkg')
| -rw-r--r-- | usr.sbin/pkg/elf_tables.h | 1 | ||||
| -rw-r--r-- | usr.sbin/pkg/pkg.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/pkg/elf_tables.h b/usr.sbin/pkg/elf_tables.h index 0589ecf..55fd3bb 100644 --- a/usr.sbin/pkg/elf_tables.h +++ b/usr.sbin/pkg/elf_tables.h @@ -42,7 +42,6 @@ static struct _elf_corres mach_corres[] = { { EM_PPC, "powerpc" }, { EM_PPC64, "powerpc" }, { EM_SPARCV9, "sparc64" }, - { EM_IA_64, "ia64" }, { -1, NULL }, }; diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 1b1a01c..8f26c61 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -126,7 +126,8 @@ extract_pkg_static(int fd, char *p, int sz) 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); |
