PERFORCE change 178023 for review

[Garrett Cooper]

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

Change 178023 by gcooper at gcooper-bayonetta on 2010/05/10 04:04:21

	Previous commit included WiP code with pkg_perform to get the archive
	bits in the proper place. Well, that cat's out of the bag...
	
	Oh yeah, and provide actionable data if and when fopen or fclose
	fails for +CONTENTS.

Affected files ...

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

Differences ...

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

@@ -314,13 +314,12 @@
     fp = fopen(CONTENTS_FNAME, "w");
     if (!fp) {
 	cleanup(0);
-	errx(2, "%s: can't open file %s for writing", __func__,
-	    CONTENTS_FNAME);
+	err(2, "%s: can't open file %s for writing", __func__, CONTENTS_FNAME);
     }
     write_plist(&plist, fp);
     if (fclose(fp)) {
 	cleanup(0);
-	errx(2, "%s: error while closing %s", __func__, CONTENTS_FNAME);
+	err(2, "%s: error occurred when closing %s", __func__, CONTENTS_FNAME);
     }
 
     /* And stick it into a tar ball */