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
This commit is contained in:
Bryan Drewery 2015-04-03 18:01:51 +00:00
parent 137da8bf45
commit 0c764bcbfd
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/stable/10/; revision=281044

View File

@ -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;