Correct return status logic a bit.

1 files changed, 11 insertions, 9 deletions

diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index 96058b9..3b0090d 100644
--- a/usr.sbin/sysinstall/package.c
+++ b/usr.sbin/sysinstall/package.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: package.c,v 1.70 1999/05/12 07:12:01 jkh Exp $
+ * $Id: package.c,v 1.71 1999/05/12 09:02:36 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -117,15 +117,15 @@ package_extract(Device *dev, char *name, Boolean depended)
     if (package_exists(name))
 	return DITEM_SUCCESS;
 
-    /* If necessary, initialize the ldconfig hints */
-    if (!file_readable("/var/run/ld.so.hints"))
-	vsystem("ldconfig /usr/lib /usr/local/lib /usr/X11R6/lib");
-
     if (!dev->init(dev)) {
 	msgConfirm("Unable to initialize media type for package extract.");
 	return DITEM_FAILURE;
     }
 
+    /* If necessary, initialize the ldconfig hints */
+    if (!file_readable("/var/run/ld.so.hints"))
+	vsystem("ldconfig /usr/lib /usr/local/lib /usr/X11R6/lib");
+
     /* Be initially optimistic */
     ret = DITEM_SUCCESS | DITEM_RESTORE;
     /* Make a couple of paranoid locations for temp files to live if user specified none */
@@ -136,10 +136,12 @@ package_extract(Device *dev, char *name, Boolean depended)
     Mkdir(variable_get(VAR_PKG_TMPDIR));
     vsystem("chmod 1777 %s", variable_get(VAR_PKG_TMPDIR));
 
-    if (!strpbrk(name, "-_"))
-	sprintf(path, "packages/Latest/%s.tgz", name);
-    else if (!index(name, '/'))
-	sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
+    if (!index(name, '/')) {
+	if (!strpbrk(name, "-_"))
+	    sprintf(path, "packages/Latest/%s.tgz", name);
+	else
+	    sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
+    }
     else
 	sprintf(path, "%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");