diff options
| author | jkh <jkh@FreeBSD.org> | 1993-10-10 20:25:31 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1993-10-10 20:25:31 +0000 |
| commit | bae438b28c46d5b77df74c0989b15c49dd9317d1 (patch) | |
| tree | d987a9eee6cc5c1ac371efc7dc2ccab10c6821ed /usr.sbin/pkg_install | |
| parent | 666e5b37520694fcaf492b68df7eb5e8b5af23d7 (diff) | |
| download | FreeBSD-src-bae438b28c46d5b77df74c0989b15c49dd9317d1.zip FreeBSD-src-bae438b28c46d5b77df74c0989b15c49dd9317d1.tar.gz | |
If require script fails, don't try to delete installed package.
Diffstat (limited to 'usr.sbin/pkg_install')
| -rw-r--r-- | usr.sbin/pkg_install/add/perform.c | 6 |
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 7c6a283..5029690 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)) { |
