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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
