diff options
| author | jkh <jkh@FreeBSD.org> | 1999-05-07 20:31:36 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1999-05-07 20:31:36 +0000 |
| commit | bcf1d181f22a738392ff7e905c13191073cd4405 (patch) | |
| tree | 93b1a4ce2b9a7b759465308cea855eae6d26b50f /usr.sbin/sysinstall/package.c | |
| parent | e53213fbe374457f07bf701745c2b4f79e26d689 (diff) | |
| download | FreeBSD-src-bcf1d181f22a738392ff7e905c13191073cd4405.zip FreeBSD-src-bcf1d181f22a738392ff7e905c13191073cd4405.tar.gz | |
Don't install compat22 by default.
Add some more safety belts to package foo.
Diffstat (limited to 'usr.sbin/sysinstall/package.c')
| -rw-r--r-- | usr.sbin/sysinstall/package.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c index 990064c..43d99b6 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.66 1999/02/05 22:15:51 jkh Exp $ + * $Id: package.c,v 1.67 1999/04/27 14:33:29 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -79,6 +79,10 @@ package_exists(char *name) char fname[FILENAME_MAX]; int status /* = vsystem("pkg_info -e %s", name) */; + /* If in "Latest" syntax, ignore; can't tell with these */ + if (name[0] == '@') + return FALSE; + /* XXX KLUDGE ALERT! This makes evil assumptions about how XXX * packages register themselves and should *really be done with * `pkg_info -e <name>' except that this it's too slow for an @@ -192,6 +196,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)); |
