Date: Tue, 28 Jul 2015 17:20:36 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r285968 - vendor/libarchive/dist/libarchive Message-ID: <201507281720.t6SHKaDb028227@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Jul 28 17:20:35 2015 New Revision: 285968 URL: https://svnweb.freebsd.org/changeset/base/285968 Log: Apply upstream changeset fa9e61: Fix --one-file-system to include the directory encountered rather than excluding it. Modified: vendor/libarchive/dist/libarchive/archive_read_disk_posix.c Modified: vendor/libarchive/dist/libarchive/archive_read_disk_posix.c ============================================================================== --- vendor/libarchive/dist/libarchive/archive_read_disk_posix.c Tue Jul 28 17:12:41 2015 (r285967) +++ vendor/libarchive/dist/libarchive/archive_read_disk_posix.c Tue Jul 28 17:20:35 2015 (r285968) @@ -974,7 +974,7 @@ next_entry(struct archive_read_disk *a, t->initial_filesystem_id = t->current_filesystem_id; if (!a->traverse_mount_points) { if (t->initial_filesystem_id != t->current_filesystem_id) - return (ARCHIVE_RETRY); + descend = 0; } t->descend = descend;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507281720.t6SHKaDb028227>