diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2010-01-26 15:03:40 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2010-01-26 15:03:40 +0000 |
commit | 4430fea5f39b7286e8baa84111a39a83501ddce1 (patch) | |
tree | c4e2bda7a8bdfc7c992cec648f5b0a2a72c9806b /usr.sbin | |
parent | fc600a0e46afd4a2a1555de7e774071e230d0bf5 (diff) |
downgrade, not downgrades
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Update.pm | 4 | ||||
-rw-r--r-- | usr.sbin/pkg_add/pkg_add.1 | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm index e79e4f20788..e7e1675187f 100644 --- a/usr.sbin/pkg_add/OpenBSD/Update.pm +++ b/usr.sbin/pkg_add/OpenBSD/Update.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Update.pm,v 1.133 2010/01/10 16:03:49 espie Exp $ +# $OpenBSD: Update.pm,v 1.134 2010/01/26 15:03:39 espie Exp $ # # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org> # @@ -164,7 +164,7 @@ sub process_handle next; } my $r = $plist->signature->compare($p2->signature); - if (defined $r && $r > 0 && !$state->{defines}{downgrades}) { + if (defined $r && $r > 0 && !$state->{defines}{downgrade}) { $oldfound = 1; next; } diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1 index bdd9c347269..519380ecec7 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.95 2010/01/11 10:16:20 jmc Exp $ +.\" $OpenBSD: pkg_add.1,v 1.96 2010/01/26 15:03:39 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: January 11 2010 $ +.Dd $Mdocdate: January 26 2010 $ .Dt PKG_ADD 1 .Os .Sh NAME @@ -249,7 +249,7 @@ by default, if dependencies are too strict, will merge updates together to make sure everything stays in synch. .Fl D Ar dontmerge disables that behavior. -.It Ar downgrades +.It Ar downgrade don't filter out package versions older than what's currently installed. .It Ar installed in update mode, reinstall an existing package with the same signature. |