From eb828e1bb5fc732f80955a54dcc4c81e26f6228a Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Tue, 31 Mar 2015 00:00:47 +0000 Subject: [PATCH] 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 --- contrib/libarchive/libarchive/archive_read_disk_posix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/libarchive/libarchive/archive_read_disk_posix.c b/contrib/libarchive/libarchive/archive_read_disk_posix.c index a13dbbf812c..1787d864ca9 100644 --- a/contrib/libarchive/libarchive/archive_read_disk_posix.c +++ b/contrib/libarchive/libarchive/archive_read_disk_posix.c @@ -974,7 +974,7 @@ next_entry(struct archive_read_disk *a, struct tree *t, 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;