diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2010-10-28 22:33:44 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2010-10-28 22:33:44 +0000 |
| commit | 6987f819f0504a38818ea30c7b3de582dbd72107 (patch) | |
| tree | f6aaea7476c4846497d9f85c25549c5653b458e0 | |
| parent | 075072be68d1e2daece9b712d515413661ce853e (diff) | |
:-P
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Replace.pm | 10 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add.1 | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm index d911c586e45..c96e40491d4 100644 --- a/usr.sbin/pkg_add/OpenBSD/Replace.pm +++ b/usr.sbin/pkg_add/OpenBSD/Replace.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Replace.pm,v 1.78 2010/10/27 14:35:56 espie Exp $ +# $OpenBSD: Replace.pm,v 1.79 2010/10/28 22:33:43 espie Exp $ # # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org> # @@ -207,7 +207,7 @@ sub is_set_safe { my ($set, $state) = @_; - if ($state->defines('update') && !$state->verbose) { + if (!$state->defines('paranoid') && !$state->verbose) { return 1; } @@ -221,8 +221,8 @@ sub is_set_safe } return 1 if $ok; - if ($state->defines('update')) { - $state->errsay("Forcing update"); + if (!$state->defines('paranoid')) { + $state->errsay("Running update"); return 1; } elsif ($state->{interactive}) { @@ -232,7 +232,7 @@ sub is_set_safe return 0; } } else { - $state->errsay("Cannot install #1 (use -D update)", + $state->errsay("Cannot install #1", $set->print); return 0; } diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1 index e29315d1a73..e3067882916 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.102 2010/08/01 23:03:48 espie Exp $ +.\" $OpenBSD: pkg_add.1,v 1.103 2010/10/28 22:33:43 espie Exp $ .\" .\" Documentation and design originally from FreeBSD. All the code has .\" been rewritten since. We keep the documentation's notice: @@ -15,7 +15,7 @@ .\" Jordan K. Hubbard .\" .\" -.Dd $Mdocdate: August 1 2010 $ +.Dd $Mdocdate: October 28 2010 $ .Dt PKG_ADD 1 .Os .Sh NAME @@ -260,12 +260,12 @@ install even if not running as root. .It Ar nosig do not check digital signatures. Still displays a very prominent message if a signature is found. +.It Ar paranoid +very safe update: don't run any @exec/@unexec. .It Ar repair attempt to repair installed packages with missing registration data. .It Ar scripts external scripts may fail. -.It Ar update -unsafe update: old packing-list will run scripts that may fail. .It Ar updatedepends force update even if forward dependencies no longer match. .El |