aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1999-05-12 10:55:13 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1999-05-12 10:55:13 +0000
commitc710e069d253f464c8afca0cd3f2445abbfd672e (patch)
tree17259298d808b866cbb9b362e033f321fd92de9e
parent23882549e21e93409e4f47c122300d5993484f83 (diff)
Notes
-rw-r--r--release/sysinstall/package.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c
index 6bda17ed2503..d1e892a2d2aa 100644
--- a/release/sysinstall/package.c
+++ b/release/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.65.2.2 1999/04/28 06:58:15 jkh Exp $
+ * $Id: package.c,v 1.65.2.3 1999/05/12 09:04:15 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -142,6 +142,8 @@ package_extract(Device *dev, char *name, Boolean depended)
sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
else
sprintf(path, "%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
+
+ /* We have a path, call the device strategy routine to get the file */
fp = dev->get(dev, path, TRUE);
if (fp) {
int i = 0, tot, pfd[2];
@@ -203,6 +205,7 @@ package_extract(Device *dev, char *name, Boolean depended)
refresh();
i = waitpid(pid, &tot, 0);
if (sigpipe_caught || i < 0 || WEXITSTATUS(tot)) {
+ ret = DITEM_FAILURE | DITEM_RESTORE;
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Add of package %s aborted, error code %d -\n"
"Please check the debug screen for more info.", name, WEXITSTATUS(tot));