diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-03-31 00:00:47 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-03-31 00:00:47 +0000 |
| commit | b845121fe0fc35a40fbe55b318c2991447f9eed5 (patch) | |
| tree | e3f2d5ac428900e95d81b46c97a69bfd7ebbcb30 /contrib/libarchive | |
| parent | e4390a88235ed4a2f8c859fc3769690b560bb513 (diff) | |
| download | FreeBSD-src-b845121fe0fc35a40fbe55b318c2991447f9eed5.zip FreeBSD-src-b845121fe0fc35a40fbe55b318c2991447f9eed5.tar.gz | |
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
Diffstat (limited to 'contrib/libarchive')
| -rw-r--r-- | contrib/libarchive/libarchive/archive_read_disk_posix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/libarchive/libarchive/archive_read_disk_posix.c b/contrib/libarchive/libarchive/archive_read_disk_posix.c index a13dbbf..1787d86 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; |
