diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-04-03 18:01:51 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-04-03 18:01:51 +0000 |
| commit | e247370125655f0c959f224089b349eef7280c4c (patch) | |
| tree | 1fbbbf0bf71ae390344cdf839cba06638ff2a8c6 | |
| parent | 2c4a772c3e6c8a3afbb20e42841774f421363f5c (diff) | |
| download | FreeBSD-src-e247370125655f0c959f224089b349eef7280c4c.zip FreeBSD-src-e247370125655f0c959f224089b349eef7280c4c.tar.gz | |
MFC r280870:
Fix --one-file-system to include the directory encountered rather than
excluding it. This was broken in 3.0.4 (r238856).
Relnotes: yes
| -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; |
