diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2015-03-09 11:09:01 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2015-03-09 11:09:01 +0000 |
| commit | 2b225907fb55cbf6a031447d7255849157920245 (patch) | |
| tree | 0156ade396928b8e486c7a0e043869725ebec090 /usr.sbin/pkg_add | |
| parent | 966729b9935b9ebaf83285e6f73c348f55b5b1c5 (diff) | |
make -DSHORTENED the default: don't update unless there is an actual
change in dependencies: shared library versions, and explicit version
requirements in dependencies.
as discussed with aja@ before the lock.
Diffstat (limited to 'usr.sbin/pkg_add')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgAdd.pm | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Signature.pm | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm index c950213613b..bd0868c7867 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgAdd.pm,v 1.83 2015/01/27 09:35:35 espie Exp $ +# $OpenBSD: PkgAdd.pm,v 1.84 2015/03/09 11:09:00 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -39,7 +39,7 @@ sub has_different_sig if (!defined $plist->{different_sig}) { my $n = OpenBSD::PackingList->from_installation($plist->pkgname)->signature; my $o = $plist->signature; - my $r = $n->compare($o, $state->defines("SHORTENED")); + my $r = $n->compare($o); $state->print("Comparing full signature for #1 \"#2\" vs. \"#3\":", $plist->pkgname, $o->string, $n->string) if $state->verbose >= 3; diff --git a/usr.sbin/pkg_add/OpenBSD/Signature.pm b/usr.sbin/pkg_add/OpenBSD/Signature.pm index e4800a283a3..468aa8486f2 100644 --- a/usr.sbin/pkg_add/OpenBSD/Signature.pm +++ b/usr.sbin/pkg_add/OpenBSD/Signature.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Signature.pm,v 1.16 2015/01/19 09:42:06 espie Exp $ +# $OpenBSD: Signature.pm,v 1.17 2015/03/09 11:09:00 espie Exp $ # # Copyright (c) 2010 Marc Espie <espie@openbsd.org> # @@ -96,13 +96,13 @@ sub string sub compare { - my ($a, $b, $shortened) = @_; - return $b->revert_compare($a, $shortened); + my ($a, $b) = @_; + return $b->revert_compare($a); } sub revert_compare { - my ($b, $a, $shortened) = @_; + my ($b, $a) = @_; if ($a->{name} eq $b->{name}) { my $awins = 0; @@ -116,7 +116,7 @@ sub revert_compare next; } $done->{$k} = 1; - next if $shortened && !$v->always; + next if !$v->always; my $r = $v->compare($b->{extra}{$k}); if ($r > 0) { $awins++; |