From owner-p4-projects@FreeBSD.ORG  Tue May 11 14:44:02 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 599941065674; Tue, 11 May 2010 14:44:02 +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 135B5106566B
	for <perforce@FreeBSD.org>; Tue, 11 May 2010 14:44:02 +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 023238FC17
	for <perforce@FreeBSD.org>; Tue, 11 May 2010 14:44:02 +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 o4BEi1bm022285
	for <perforce@FreeBSD.org>; Tue, 11 May 2010 14:44:01 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4BEi1JQ022283
	for perforce@freebsd.org; Tue, 11 May 2010 14:44:01 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Tue, 11 May 2010 14:44:01 GMT
Message-Id: <201005111444.o4BEi1JQ022283@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 178097 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: Tue, 11 May 2010 14:44:02 -0000

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

Change 178097 by gcooper@starr on 2010/05/11 14:44:01

	Fix the error catch with a archive_write_new failure, and make sure that we actually truncate any existing files if Regenerate is TRUE.

Affected files ...

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

Differences ...

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

@@ -403,8 +403,10 @@
 
 	archive_open_flags = O_WRONLY;
 
-	if (Regenerate == FALSE)
-		archive_open_flags |= O_CREAT;
+        if (Regenerate == TRUE)
+                archive_open_flags |= O_TRUNC;
+        else
+                archive_open_flags |= O_CREAT;
 
 	/* 
 	 * NOTE (gcooper): No sense in calloc'ing destfile or srcfile as the
@@ -425,7 +427,7 @@
 			warn("Skipping package creation for: '%s'", tball);
 	}
 	else if ((archive = archive_write_new()) == NULL)
-		error = archive_error_string(archive);
+		error = strerror(errno);
 	else if (archive_write_set_format_ustar(archive) != ARCHIVE_OK)
 		error = archive_error_string(archive);
 	else {