Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Apr 2010 05:21:42 GMT
From:      Garrett Cooper <gcooper@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 176607 for review
Message-ID:  <201004070521.o375Lg4u090075@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004070521.o375Lg4u090075>