From owner-svn-src-head@FreeBSD.ORG  Tue Mar 31 00:00:49 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1CF19EDB;
 Tue, 31 Mar 2015 00:00:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 088F2E04;
 Tue, 31 Mar 2015 00:00:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2V00mu0005396;
 Tue, 31 Mar 2015 00:00:48 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2V00mLm005395;
 Tue, 31 Mar 2015 00:00:48 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201503310000.t2V00mLm005395@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 31 Mar 2015 00:00:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280870 - head/contrib/libarchive/libarchive
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Mar 2015 00:00:49 -0000

Author: bdrewery
Date: Tue Mar 31 00:00:47 2015
New Revision: 280870
URL: https://svnweb.freebsd.org/changeset/base/280870

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

Modified:
  head/contrib/libarchive/libarchive/archive_read_disk_posix.c

Modified: head/contrib/libarchive/libarchive/archive_read_disk_posix.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_disk_posix.c	Mon Mar 30 22:49:26 2015	(r280869)
+++ head/contrib/libarchive/libarchive/archive_read_disk_posix.c	Tue Mar 31 00:00:47 2015	(r280870)
@@ -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;