aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_install
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1993-10-10 20:25:31 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1993-10-10 20:25:31 +0000
commitbb9863dc0b39edd13dc777f9bdabf050052161b4 (patch)
treed987a9eee6cc5c1ac371efc7dc2ccab10c6821ed /usr.sbin/pkg_install
parent7f801ea51ee0d1b1f58ac2ce16d6300ff2d1127e (diff)
downloadsrc-bb9863dc0b39edd13dc777f9bdabf050052161b4.tar.gz
src-bb9863dc0b39edd13dc777f9bdabf050052161b4.zip
If require script fails, don't try to delete installed package.
Notes
Notes: svn path=/head/; revision=573
Diffstat (limited to 'usr.sbin/pkg_install')
-rw-r--r--usr.sbin/pkg_install/add/perform.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c
index 7c6a28324a71..5029690ef485 100644
--- a/usr.sbin/pkg_install/add/perform.c
+++ b/usr.sbin/pkg_install/add/perform.c
@@ -1,5 +1,5 @@
#ifndef lint
-static const char *rcsid = "$Id: perform.c,v 1.4 1993/09/18 03:38:48 jkh Exp $";
+static const char *rcsid = "$Id: perform.c,v 1.5 1993/10/08 01:19:28 jkh Exp $";
#endif
/*
@@ -115,7 +115,7 @@ pkg_do(char *pkg)
if (AddMode == MASTER) {
printf("%s\n", where_playpen());
write_plist(&Plist, stdout);
- return;
+ return 0;
}
}
PkgName = find_name(&Plist);
@@ -126,7 +126,7 @@ pkg_do(char *pkg)
if (!Fake && vsystem("./%s %s INSTALL", REQUIRE_FNAME, PkgName)) {
whinge("Package %s fails requirements - not installed.",
pkg_fullname);
- goto fail;
+ return 1;
}
}
if (!NoInstall && fexists(INSTALL_FNAME)) {