diff options
author | jkh <jkh@FreeBSD.org> | 1995-10-19 15:57:23 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1995-10-19 15:57:23 +0000 |
commit | 26765522cec0d44af5e1e6b0516c0912524a770f (patch) | |
tree | cb89f2b12123b6095c091eec366f98cccb7e1bec /release/sysinstall/package.c | |
parent | 0327f513f617dfcbed83e313f9d9a4b586e66e5b (diff) | |
download | FreeBSD-src-26765522cec0d44af5e1e6b0516c0912524a770f.zip FreeBSD-src-26765522cec0d44af5e1e6b0516c0912524a770f.tar.gz |
Sync with today's sources:
o Implement the 2.0.5->2.1 upgrade procedure (gah).
o Bring in Coranth's support for configuration of anon ftp and Samba
plus some changes of my own.
o More attempts to actually write the documentation in english.
o Update docs to contain more 2.1-centric information.
Diffstat (limited to 'release/sysinstall/package.c')
-rw-r--r-- | release/sysinstall/package.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c index 5fe2f20..dcf3e34 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.2 1995/10/16 15:14:21 jkh Exp $ + * $Id: package.c,v 1.3 1995/10/18 00:12:38 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -77,7 +77,7 @@ package_extract(Device *dev, char *name) if (fd >= 0) { pid_t tpid; - msgNotify("Fetching %s from %s\n", path, dev->name); + msgNotify("Fetching %s from %s", path, dev->name); pen[0] = '\0'; if ((where = make_playpen(pen, 0)) != NULL) { if (isDebug()) @@ -93,7 +93,6 @@ package_extract(Device *dev, char *name) else { int pstat; - close(fd); tpid = waitpid(tpid, &pstat, 0); if (vsystem("(pwd; cat +CONTENTS) | pkg_add %s-S", !strcmp(variable_get(CPIO_VERBOSITY_LEVEL), "high") ? "-v " : "")) @@ -101,6 +100,7 @@ package_extract(Device *dev, char *name) "Please check debugging screen for possible further details.", path); else ret = RET_SUCCESS; + close(fd); } if (chdir(where) == -1) msgFatal("Unable to get back to where I was before, Jojo!\n(That was: %s)\n", where); |