diff options
| author | jkh <jkh@FreeBSD.org> | 1996-06-20 18:33:55 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-06-20 18:33:55 +0000 |
| commit | e8d26b1581dab3026009757a94a8134f0fd851ae (patch) | |
| tree | dba527c7f22937fd67058464959dfb7d8498f44d /usr.sbin/pkg_install/delete/perform.c | |
| parent | 0f52bd5cc8f1e74e89612834f46148b97a43991e (diff) | |
| download | FreeBSD-src-e8d26b1581dab3026009757a94a8134f0fd851ae.zip FreeBSD-src-e8d26b1581dab3026009757a94a8134f0fd851ae.tar.gz | |
Make pkg_install understand and use libftpio instead of its own
copies of the ftp support routines. Also some cosmetic and minor
bug fixes I've been meaning to incorporate for awhile.
Diffstat (limited to 'usr.sbin/pkg_install/delete/perform.c')
| -rw-r--r-- | usr.sbin/pkg_install/delete/perform.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c index fefe6e8..dd3810a 100644 --- a/usr.sbin/pkg_install/delete/perform.c +++ b/usr.sbin/pkg_install/delete/perform.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: perform.c,v 1.7.4.1 1995/11/10 06:44:47 jkh Exp $"; +static const char *rcsid = "$Id: perform.c,v 1.8 1995/11/12 04:55:30 jkh Exp $"; #endif /* @@ -123,7 +123,7 @@ pkg_do(char *pkg) if (!Fake) { /* Some packages aren't packed right, so we need to just ignore delete_package()'s status. Ugh! :-( */ if (delete_package(FALSE, CleanDirs, &Plist) == FAIL) - warn("Couldn't entirely delete package (perhaps the packing list is\n" + whinge("Couldn't entirely delete package (perhaps the packing list is\n" "incorrectly specified?)\n"); if (vsystem("%s -r %s", REMOVE_CMD, LogDir)) { whinge("Couldn't remove log entry in %s, de-install failed.", LogDir); @@ -206,7 +206,7 @@ undepend(PackingList p, char *pkgname) return; } if (rename(ftmp, fname) == -1) - warn("Error renaming `%s' to `%s'", ftmp, fname); + whinge("Error renaming `%s' to `%s'", ftmp, fname); remove(ftmp); /* just in case */ return; } |
