diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2003-11-06 18:06:01 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2003-11-06 18:06:01 +0000 |
| commit | b9b051eec5d23d3068ae51ca9c3d94d13db36999 (patch) | |
| tree | 23e239cc738924c457ace39ac1dfeac09dd308b5 /usr.sbin | |
| parent | dd9a949480b38b76d8dc0263532007595ee8554f (diff) | |
do not try to run the post-install script on an aborted pkg_add.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index 5e101ae3fe1..36df74cee91 100644 --- a/usr.sbin/pkg_add/pkg_add +++ b/usr.sbin/pkg_add/pkg_add @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_add,v 1.6 2003/11/06 18:04:10 espie Exp $ +# $OpenBSD: pkg_add,v 1.7 2003/11/06 18:06:00 espie Exp $ # # Copyright (c) 2003 Marc Espie. # @@ -256,7 +256,7 @@ sub really_add($) } $handle->close(); - if ($plist->has(INSTALL)) { + if ($plist->has(INSTALL) && !$interrupted) { print "Install script: $dir",INSTALL ,"$pkgname POST-INSTALL\n" if $opt_v or $opt_n; unless ($opt_n) { system($dir.INSTALL, $pkgname, "POST-INSTALL") == 0 or die "install script borked"; |