summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/pkg_add.1
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2014-02-11 10:36:14 +0000
committerMarc Espie <espie@cvs.openbsd.org>2014-02-11 10:36:14 +0000
commit7f4dfb94e936228a749cc88e9cfdfc929e2911f9 (patch)
tree47e4f003e511d8ceb808ce6bf0d9723bae01bc76 /usr.sbin/pkg_add/pkg_add.1
parentcd8e995d6c85fe4bc2d277b5c46e21a58b8a58dc (diff)
requalify signature -> update signature and explain a bit more.
unconfusing, okay sthen@
Diffstat (limited to 'usr.sbin/pkg_add/pkg_add.1')
-rw-r--r--usr.sbin/pkg_add/pkg_add.114
1 files changed, 8 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index d59a37d58aa..c2e64ddb68f 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.123 2014/02/08 08:54:26 espie Exp $
+.\" $OpenBSD: pkg_add.1,v 1.124 2014/02/11 10:36:13 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: February 8 2014 $
+.Dd $Mdocdate: February 11 2014 $
.Dt PKG_ADD 1
.Os
.Sh NAME
@@ -288,7 +288,7 @@ set by
.Xr fw_update 1
to separate firmwares from normal packages.
.It Ar installed
-in update mode, reinstall an existing package with the same signature.
+in update mode, reinstall an existing package with the same update signature.
.It Ar libdepends
library specifications may not be fulfilled.
.It Ar nonroot
@@ -619,7 +619,9 @@ When replacing packages, the procedure is slightly different.
.Bl -enum
.It
A check is made to determine if a similar package is already installed.
-If its signature is identical to that of the new package, no replacement
+If so, its full update signature is computed, which contains all the
+necessary dependency information along with the actual package version.
+If that signature is identical to that of the new package, no replacement
is performed (unless -D installed is specified).
.It
A check is made to determine what old package(s) the new package(s) should
@@ -701,8 +703,8 @@ and
.Pc
in order to weed out similar packages with distinct options.
.It
-The signature of the candidate is compared to the signature of the already
-installed package: identical signatures mean no update needed.
+The update signature of the candidate is compared to the signature of the
+already installed package: identical signatures mean no update needed.
.It
If several candidates are left,
.Nm