From owner-cvs-all@FreeBSD.ORG  Tue Mar 13 06:04:24 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D707616A401;
	Tue, 13 Mar 2007 06:04:24 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B82E113C448;
	Tue, 13 Mar 2007 06:04:24 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2D64O0q044110;
	Tue, 13 Mar 2007 06:04:24 GMT
	(envelope-from kientzle@repoman.freebsd.org)
Received: (from kientzle@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2D64Oj1044109;
	Tue, 13 Mar 2007 06:04:24 GMT (envelope-from kientzle)
Message-Id: <200703130604.l2D64Oj1044109@repoman.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Tue, 13 Mar 2007 06:04:24 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/lib/libarchive Makefile archive_write_disk.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Mar 2007 06:04:24 -0000

kientzle    2007-03-13 06:04:24 UTC

  FreeBSD src repository

  Modified files:
    lib/libarchive       Makefile archive_write_disk.c 
  Log:
  When ARCHIVE_EXTRACT_UNLINK is requested:
    * Only try to remove the existing item if we're not restoring a directory.
    * If unlink fails, try rmdir next.
  This should fix the broken --unlink option in bsdtar.
  
  Thanks again to: Kris Kennaway, for beating up bsdtar on pointyhat.
  
  Revision  Changes    Path
  1.61      +1 -1      src/lib/libarchive/Makefile
  1.3       +10 -4     src/lib/libarchive/archive_write_disk.c