From owner-p4-projects@FreeBSD.ORG  Wed Apr  7 05:21:43 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DDB39106566C; Wed,  7 Apr 2010 05:21:42 +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 A211A1065698
	for <perforce@FreeBSD.org>; Wed,  7 Apr 2010 05:21:42 +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 8E3B18FC2B
	for <perforce@FreeBSD.org>; Wed,  7 Apr 2010 05:21:42 +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 o375Lghk090077
	for <perforce@FreeBSD.org>; Wed, 7 Apr 2010 05:21:42 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o375Lg4u090075
	for perforce@freebsd.org; Wed, 7 Apr 2010 05:21:42 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Wed, 7 Apr 2010 05:21:42 GMT
Message-Id: <201004070521.o375Lg4u090075@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 176607 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:21:43 -0000

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

Change 176607 by gcooper@gcooper-bayonetta on 2010/04/07 05:21:29

	Fix the last collision.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/futil.c#4 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/futil.c#4 (text+ko) ====

@@ -50,13 +50,7 @@
 	    }
 	}
 	else {
->>>> ORIGINAL //depot/vendor/freebsd/src/usr.sbin/pkg_install/add/futil.c#5
-	    if (vsystem("/bin/mkdir %s", dir)) {
-==== THEIRS //depot/vendor/freebsd/src/usr.sbin/pkg_install/add/futil.c#6
 	    if (mkdir(dir, 0777) < 0) {
-==== YOURS //gcooper-bayonetta/pkg_install-enhancements/usr.sbin/pkg_install/add/futil.c
-	    if (mkdir(dir, 0700) < 0) {
-<<<<
 		if (cp2)
 		    *cp2 = '/';
 		return FAIL;