From owner-p4-releng  Tue Apr  2 13:22:11 2002
Delivered-To: p4-releng@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B18DE37B417; Tue,  2 Apr 2002 13:22:07 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 1A22137B405
	for <perforce@freebsd.org>; Tue,  2 Apr 2002 13:22:07 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g32LM7d24249
	for perforce@freebsd.org; Tue, 2 Apr 2002 13:22:07 -0800 (PST)
	(envelope-from murray@freebsd.org)
Date: Tue, 2 Apr 2002 13:22:07 -0800 (PST)
Message-Id: <200204022122.g32LM7d24249@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to murray@freebsd.org using -f
From: Murray Stokely <murray@FreeBSD.org>
Subject: PERFORCE change 8925 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-releng@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-releng.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-releng>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-releng>
X-Loop: FreeBSD.ORG

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