aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2015-07-28 17:20:35 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2015-07-28 17:20:35 +0000
commit34f1f5d95ee3aec85eb7e154d76a5c8aaf40beaa (patch)
tree4b59d844fe866bb4572e2f171f329425eb9cddbb
parent5361c268d41ce92a3a5ff27d26edf986a3bf85d8 (diff)
downloadsrc-34f1f5d95ee3aec85eb7e154d76a5c8aaf40beaa.tar.gz
src-34f1f5d95ee3aec85eb7e154d76a5c8aaf40beaa.zip
Apply upstream changeset fa9e61:
Fix --one-file-system to include the directory encountered rather than excluding it.
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=285968
-rw-r--r--libarchive/archive_read_disk_posix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index a13dbbf812cf..1787d864ca92 100644
--- a/libarchive/archive_read_disk_posix.c
+++ b/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;