1 files changed, 13 insertions, 0 deletions

diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c
index b3ca29e2352e..bc6f3f80ca73 100644
--- a/usr.sbin/sysinstall/index.c
+++ b/usr.sbin/sysinstall/index.c
@@ -640,6 +640,19 @@ index_extract(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended)
     IndexEntryPtr id = who->data;
     WINDOW *w = savescr();
 
+    /* 
+     * Short-circuit the package dependency checks.  We're already
+     * maintaining a data structure of installed packages, so if a
+     * package is already installed, don't try to check to make sure
+     * that all of its dependencies are installed.  At best this
+     * wastes a ton of cycles and can cause minor delays between
+     * package extraction.  At worst it can cause an infinite loop with
+     * a certain faulty INDEX file. 
+     */
+
+    if (id->installed == 1)
+	    return DITEM_SUCCESS;
+
     if (id && id->deps && strlen(id->deps)) {
 	char t[1024], *cp, *cp2;