From owner-svn-src-head@FreeBSD.ORG  Sat Apr  3 10:55:11 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C27801065672;
	Sat,  3 Apr 2010 10:55:11 +0000 (UTC) (envelope-from flz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B1C198FC0A;
	Sat,  3 Apr 2010 10:55:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o33AtBhm065798;
	Sat, 3 Apr 2010 10:55:11 GMT (envelope-from flz@svn.freebsd.org)
Received: (from flz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o33AtBI7065797;
	Sat, 3 Apr 2010 10:55:11 GMT (envelope-from flz@svn.freebsd.org)
Message-Id: <201004031055.o33AtBI7065797@svn.freebsd.org>
From: Florent Thoumie <flz@FreeBSD.org>
Date: Sat, 3 Apr 2010 10:55:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206132 - head/usr.sbin/pkg_install/lib
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 03 Apr 2010 10:55:11 -0000

Author: flz
Date: Sat Apr  3 10:55:11 2010
New Revision: 206132
URL: http://svn.freebsd.org/changeset/base/206132

Log:
  Fix pkg_delete, check if the file we're trying to delete is a
  symlink before complaining that it doesn't exist. Typical case
  would be a leftover library symlink that's left over after the
  actual library has been removed.
  
  Reported by:	tabthorpe

Modified:
  head/usr.sbin/pkg_install/lib/plist.c

Modified: head/usr.sbin/pkg_install/lib/plist.c
==============================================================================
--- head/usr.sbin/pkg_install/lib/plist.c	Sat Apr  3 10:07:10 2010	(r206131)
+++ head/usr.sbin/pkg_install/lib/plist.c	Sat Apr  3 10:55:11 2010	(r206132)
@@ -551,7 +551,7 @@ delete_hierarchy(const char *dir, Boolea
     char *cp1, *cp2;
 
     cp1 = cp2 = strdup(dir);
-    if (!fexists(dir)) {
+    if (!fexists(dir) && !issymlink(dir)) {
 	if (!ign_err)
 	    warnx("%s '%s' doesn't exist",
 		isdir(dir) ? "directory" : "file", dir);