From owner-svn-src-stable@FreeBSD.ORG  Wed Apr  4 13:22:11 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3DC0B1065672;
	Wed,  4 Apr 2012 13:22:11 +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 282478FC15;
	Wed,  4 Apr 2012 13:22:11 +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 q34DMB9k005799;
	Wed, 4 Apr 2012 13:22:11 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q34DMAMB005797;
	Wed, 4 Apr 2012 13:22:10 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201204041322.q34DMAMB005797@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Wed, 4 Apr 2012 13:22:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233871 - stable/8/usr.sbin/pkg_install/delete
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2012 13:22:11 -0000

Author: pluknet
Date: Wed Apr  4 13:22:10 2012
New Revision: 233871
URL: http://svn.freebsd.org/changeset/base/233871

Log:
  MFC r225610: Print the package name on deletion errors.
  
  PR:		bin/160516
  Approved by:	portmgr (pav)
  Obtained from:	NetBSD

Modified:
  stable/8/usr.sbin/pkg_install/delete/perform.c
Directory Properties:
  stable/8/usr.sbin/pkg_install/   (props changed)
  stable/8/usr.sbin/pkg_install/add/   (props changed)
  stable/8/usr.sbin/pkg_install/info/   (props changed)

Modified: stable/8/usr.sbin/pkg_install/delete/perform.c
==============================================================================
--- stable/8/usr.sbin/pkg_install/delete/perform.c	Wed Apr  4 11:55:20 2012	(r233870)
+++ stable/8/usr.sbin/pkg_install/delete/perform.c	Wed Apr  4 13:22:10 2012	(r233871)
@@ -318,8 +318,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);