PERFORCE change 176605 for review

[Garrett Cooper]

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

Change 176605 by gcooper at 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) {