Date: Tue, 31 Mar 2015 00:00:48 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280870 - head/contrib/libarchive/libarchive Message-ID: <201503310000.t2V00mLm005395@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Mar 31 00:00:47 2015 New Revision: 280870 URL: https://svnweb.freebsd.org/changeset/base/280870 Log: Fix --one-file-system to include the directory encountered rather than excluding it. This was broken in 3.0.4 (r238856). Obtained from: https://github.com/libarchive/libarchive/commit/fa9e61 MFC after: 3 days Sponsored by: EMC / Isilon Storage Division Modified: head/contrib/libarchive/libarchive/archive_read_disk_posix.c Modified: head/contrib/libarchive/libarchive/archive_read_disk_posix.c ============================================================================== --- head/contrib/libarchive/libarchive/archive_read_disk_posix.c Mon Mar 30 22:49:26 2015 (r280869) +++ head/contrib/libarchive/libarchive/archive_read_disk_posix.c Tue Mar 31 00:00:47 2015 (r280870) @@ -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?201503310000.t2V00mLm005395>