From owner-svn-src-head@FreeBSD.ORG  Fri Sep 16 09:09:59 2011
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 57050106566B;
	Fri, 16 Sep 2011 09:09:59 +0000 (UTC)
	(envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 468078FC12;
	Fri, 16 Sep 2011 09:09:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8G99xLe012578;
	Fri, 16 Sep 2011 09:09:59 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8G99xXZ012576;
	Fri, 16 Sep 2011 09:09:59 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201109160909.p8G99xXZ012576@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Fri, 16 Sep 2011 09:09:59 +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: r225610 - head/usr.sbin/pkg_install/delete
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: Fri, 16 Sep 2011 09:09:59 -0000

Author: pluknet
Date: Fri Sep 16 09:09:58 2011
New Revision: 225610
URL: http://svn.freebsd.org/changeset/base/225610

Log:
  Print the package name on deletion errors.
  
  It appears this was already done in NetBSD a decade ago, hence
  I just reuse the change (except our code is bad styled).
  
  PR:		bin/160516
  Approved by:	portmgr
  Approved by:	re (kib)
  Obtained from:	NetBSD

Modified:
  head/usr.sbin/pkg_install/delete/perform.c

Modified: head/usr.sbin/pkg_install/delete/perform.c
==============================================================================
--- head/usr.sbin/pkg_install/delete/perform.c	Fri Sep 16 08:24:31 2011	(r225609)
+++ head/usr.sbin/pkg_install/delete/perform.c	Fri Sep 16 09:09:58 2011	(r225610)
@@ -324,8 +324,8 @@ pkg_do(char *pkg)
      */
     if (delete_package(FALSE, CleanDirs, &Plist) == FAIL)
 	warnx(
-	"couldn't entirely delete package (perhaps the packing list is\n"
-	"incorrectly specified?)");
+	"couldn't entirely delete package `%s'\n"
+	"(perhaps the packing list is incorrectly specified?)", pkg);
 
     if (chdir(LogDir) == FAIL) {
  	warnx("unable to change directory to %s! deinstall failed", LogDir);