diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-12-09 18:58:26 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-12-09 18:58:26 +0000 |
| commit | ea485e62bc6e406bf7f375142944446cd571a748 (patch) | |
| tree | 583ef40dedc623da2edfa6789835a31818af1373 /usr.sbin | |
| parent | fded6f6bd811efc6413e9533cf3d6b05431b0ac2 (diff) | |
make -f scripts work again, and document it properly in both pkg_add and
pkg_delete since it now works for both.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 8 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add.1 | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_delete.1 | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm index 2661c7e9e41..d2552514585 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingElement.pm,v 1.73 2004/11/21 15:36:17 espie Exp $ +# $OpenBSD: PackingElement.pm,v 1.74 2004/12/09 18:58:25 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -1167,7 +1167,11 @@ sub run return if $not; chmod 0755, $dir.$name; return if $state->system($dir.$name, $pkgname, @args) == 0; - Fatal $self->beautify()." script borked"; + if ($state->{forced}->{scripts}) { + $state->warn($self->beautify(), " script failed\n"); + } else { + $state->fatal($self->beautify()." script failed"); + } } package OpenBSD::PackingElement::FCOMMENT; diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1 index 73c3ad939f0..869cd5d0eff 100644 --- a/usr.sbin/pkg_add/pkg_add.1 +++ b/usr.sbin/pkg_add/pkg_add.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_add.1,v 1.26 2004/11/21 11:29:35 xsa Exp $ +.\" $OpenBSD: pkg_add.1,v 1.27 2004/12/09 18:58:25 espie Exp $ .\" .\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. @@ -146,13 +146,13 @@ architecture recorded in package may not match. .It Ar conflicts package may conflict with other packages. .It Ar installed -reinstall an existing package. +in update mode, reinstall an existing package with the same signature. .It Ar libdepends library specifications may not be fulfilled. .It Ar nonroot install even if not running as root. .It Ar scripts -install scripts may fail. +external scripts may fail. .It Ar update unsafe update: old packing-list will run scripts that may fail. .It Ar updatedepends diff --git a/usr.sbin/pkg_add/pkg_delete.1 b/usr.sbin/pkg_add/pkg_delete.1 index f5f5d11b42e..a8f623faf87 100644 --- a/usr.sbin/pkg_add/pkg_delete.1 +++ b/usr.sbin/pkg_add/pkg_delete.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_delete.1,v 1.14 2004/12/02 00:29:04 xsa Exp $ +.\" $OpenBSD: pkg_delete.1,v 1.15 2004/12/09 18:58:25 espie Exp $ .\" .\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. @@ -74,6 +74,8 @@ delete all packages matching ambiguous package specifications. also delete the whole set of packages that depends upon the requested packages. .It Ar nonroot uninstall even if not running as root. +.It Ar scripts +external scripts may fail. .It Ar uninstalled proceed even if some package names don't resolve to installed package names. .El |