From owner-p4-projects@FreeBSD.ORG  Wed Apr  7 05:14:35 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BCD811065672; Wed,  7 Apr 2010 05:14:35 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79944106566C
	for <perforce@FreeBSD.org>; Wed,  7 Apr 2010 05:14:35 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 679EF8FC18
	for <perforce@FreeBSD.org>; Wed,  7 Apr 2010 05:14:35 +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 o375EZoC089525
	for <perforce@FreeBSD.org>; Wed, 7 Apr 2010 05:14:35 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o375EZcc089523
	for perforce@freebsd.org; Wed, 7 Apr 2010 05:14:35 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Wed, 7 Apr 2010 05:14:35 GMT
Message-Id: <201004070514.o375EZcc089523@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 176605 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: Wed, 07 Apr 2010 05:14:36 -0000

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

Change 176605 by gcooper@gcooper-bayonetta on 2010/04/07 05:14:07

	Fix collision.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/pen.c#8 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/pen.c#8 (text+ko) ====

@@ -112,20 +112,8 @@
 
     if (!mkdtemp(pen)) {
 	cleanup(0);
->>>> ORIGINAL //depot/vendor/freebsd/src/usr.sbin/pkg_install/lib/pen.c#11
-	errx(2, "%s: can't mktemp '%s'", __func__, pen);
-    }
-    if (chmod(pen, 0700) == FAIL) {
-	cleanup(0);
-	errx(2, "%s: can't mkdir '%s'", __func__, pen);
-    }
-==== THEIRS //depot/vendor/freebsd/src/usr.sbin/pkg_install/lib/pen.c#12
 	errx(2, "%s: can't mktemp '%s'", __func__, pen);
     }
-==== YOURS //gcooper-bayonetta/pkg_install-enhancements/usr.sbin/pkg_install/lib/pen.c
-	errx(2, "%s: can't mkdtemp '%s'", __func__, pen);
-    }
-<<<<
 
     if (Verbose) {
 	if (sz) {