Date: Tue, 2 Apr 2002 13:22:07 -0800 (PST) From: Murray Stokely <murray@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8925 for review Message-ID: <200204022122.g32LM7d24249@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8925 Change 8925 by murray@murray_builder on 2002/04/02 13:21:30 MFC: pkg_add fix. This has been extensively tested, and will be tested further. Affected files ... ... //depot/releng/5_dp1/src/usr.sbin/pkg_install/add/perform.c#2 edit Differences ... ==== //depot/releng/5_dp1/src/usr.sbin/pkg_install/add/perform.c#2 (text+ko) ==== @@ -189,7 +189,7 @@ * compress an average of 75%, so multiply by 4 for good measure. */ - if (!inPlace && min_free(playpen) < sb.st_size * 4) { + if (!extract && !inPlace && min_free(playpen) < sb.st_size * 4) { warnx("projected size of %qd exceeds available free space.\n" "Please set your PKG_TMPDIR variable to point to a location with more\n" "free space and try again", (long long)sb.st_size * 4); @@ -202,8 +202,9 @@ if (inPlace && Fake) goto success; - /* Finally unpack the whole mess */ - if (unpack(pkg_fullname, NULL)) { + /* Finally unpack the whole mess. If extract is null we + already + did so so don't bother doing it again. */ + if (extract && unpack(pkg_fullname, NULL)) { warnx("unable to extract '%s'!", pkg_fullname); goto bomb; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-releng" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204022122.g32LM7d24249>