svn commit: r195346 - head/usr.sbin/pkg_install/add

[Brian Somers]

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) {