svn commit: r281044 - stable/10/contrib/libarchive/libarchive

[Bryan Drewery]

Author: bdrewery
Date: Fri Apr  3 18:01:51 2015
New Revision: 281044
URL: https://svnweb.freebsd.org/changeset/base/281044

Log:
  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

Modified:
  stable/10/contrib/libarchive/libarchive/archive_read_disk_posix.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/libarchive/libarchive/archive_read_disk_posix.c
==============================================================================
--- stable/10/contrib/libarchive/libarchive/archive_read_disk_posix.c	Fri Apr  3 17:54:48 2015	(r281043)
+++ stable/10/contrib/libarchive/libarchive/archive_read_disk_posix.c	Fri Apr  3 18:01:51 2015	(r281044)
@@ -974,7 +974,7 @@ next_entry(struct archive_read_disk *a, 
 		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;