From owner-svn-src-all@FreeBSD.ORG  Sun Jul  5 06:14:59 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EFB61106566C;
	Sun,  5 Jul 2009 06:14:59 +0000 (UTC)
	(envelope-from brian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DE6D18FC1E;
	Sun,  5 Jul 2009 06:14:59 +0000 (UTC)
	(envelope-from brian@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n656ExLS038760;
	Sun, 5 Jul 2009 06:14:59 GMT (envelope-from brian@svn.freebsd.org)
Received: (from brian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n656Exou038758;
	Sun, 5 Jul 2009 06:14:59 GMT (envelope-from brian@svn.freebsd.org)
Message-Id: <200907050614.n656Exou038758@svn.freebsd.org>
From: Brian Somers <brian@FreeBSD.org>
Date: Sun, 5 Jul 2009 06:14:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195346 - head/usr.sbin/pkg_install/add
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jul 2009 06:15:00 -0000

Author: brian
Date: Sun Jul  5 06:14:59 2009
New Revision: 195346
URL: http://svn.freebsd.org/changeset/base/195346

Log:
  Disable r194497 for now.  It doesn't work well with ports-mgmt/tinderbox.
  
  Approved by:	re (ken)

Modified:
  head/usr.sbin/pkg_install/add/perform.c

Modified: head/usr.sbin/pkg_install/add/perform.c
==============================================================================
--- head/usr.sbin/pkg_install/add/perform.c	Sun Jul  5 01:36:24 2009	(r195345)
+++ head/usr.sbin/pkg_install/add/perform.c	Sun Jul  5 06:14:59 2009	(r195346)
@@ -278,6 +278,7 @@ pkg_do(char *pkg)
 	    warnx("-f specified; proceeding anyway");
     }
 
+#if ENSURE_THAT_ALL_REQUIREMENTS_ARE_MET
     /*
      * Before attempting to do the slave mode bit, ensure that we've
      * downloaded & processed everything we need.
@@ -313,6 +314,7 @@ pkg_do(char *pkg)
 	    }
 	}
     }
+#endif
 
     /* Now check the packing list for dependencies */
     for (p = Plist.head; p ; p = p->next) {