summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorbrian <brian@FreeBSD.org>2009-07-05 06:14:59 +0000
committerbrian <brian@FreeBSD.org>2009-07-05 06:14:59 +0000
commit9a39c9fe40607c588bf5fa181c2b5dca3b159e04 (patch)
treee01630150b4b2be4b415d3ffadf6f6ba2533b16a /usr.sbin
parentd483a0f67c6361d1cdabe323bb62563bf5354af8 (diff)
downloadFreeBSD-src-9a39c9fe40607c588bf5fa181c2b5dca3b159e04.zip
FreeBSD-src-9a39c9fe40607c588bf5fa181c2b5dca3b159e04.tar.gz
Disable r194497 for now. It doesn't work well with ports-mgmt/tinderbox.
Approved by: re (ken)
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_install/add/perform.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c
index c391fee..499d6c6 100644
--- a/usr.sbin/pkg_install/add/perform.c
+++ b/usr.sbin/pkg_install/add/perform.c
@@ -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) {
OpenPOWER on IntegriCloud