From owner-p4-projects@FreeBSD.ORG  Mon May 10 04:05:11 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 10F951065670; Mon, 10 May 2010 04:05:11 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C9A1C1065675
	for <perforce@FreeBSD.org>; Mon, 10 May 2010 04:05:10 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B70668FC08
	for <perforce@FreeBSD.org>; Mon, 10 May 2010 04:05:10 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4A45ATr017027
	for <perforce@FreeBSD.org>; Mon, 10 May 2010 04:05:10 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4A45AYE017025
	for perforce@freebsd.org; Mon, 10 May 2010 04:05:10 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Mon, 10 May 2010 04:05:10 GMT
Message-Id: <201005100405.o4A45AYE017025@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 178023 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 04:05:11 -0000

http://p4web.freebsd.org/@@178023?ac=10

Change 178023 by gcooper@gcooper-bayonetta on 2010/05/10 04:04:21

	Previous commit included WiP code with pkg_perform to get the archive
	bits in the proper place. Well, that cat's out of the bag...
	
	Oh yeah, and provide actionable data if and when fopen or fclose
	fails for +CONTENTS.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#9 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#9 (text+ko) ====

@@ -314,13 +314,12 @@
     fp = fopen(CONTENTS_FNAME, "w");
     if (!fp) {
 	cleanup(0);
-	errx(2, "%s: can't open file %s for writing", __func__,
-	    CONTENTS_FNAME);
+	err(2, "%s: can't open file %s for writing", __func__, CONTENTS_FNAME);
     }
     write_plist(&plist, fp);
     if (fclose(fp)) {
 	cleanup(0);
-	errx(2, "%s: error while closing %s", __func__, CONTENTS_FNAME);
+	err(2, "%s: error occurred when closing %s", __func__, CONTENTS_FNAME);
     }
 
     /* And stick it into a tar ball */