From f098ff01389be6d00aac9c1d696f3d8346d92f33 Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Sat, 12 Dec 2009 17:08:08 +0000 Subject: fix the fam->libgamin issue. Look for update candidates in self before asking the repository. This solves this kind of conflicts. also, register packages we keep, this makes for simpler scenarios (todo: split updateset into further categories) --- usr.sbin/pkg_add/OpenBSD/UpdateSet.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr.sbin/pkg_add/OpenBSD/UpdateSet.pm') diff --git a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm index b32e05e6e6c..a3e3facefab 100644 --- a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm +++ b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: UpdateSet.pm,v 1.35 2009/12/07 15:09:08 espie Exp $ +# $OpenBSD: UpdateSet.pm,v 1.36 2009/12/12 17:08:07 espie Exp $ # # Copyright (c) 2007 Marc Espie # @@ -156,7 +156,8 @@ sub older_to_do require OpenBSD::PackageInfo; my @l = (); for my $h ($self->older) { - if (OpenBSD::PackageInfo::is_installed($h->pkgname)) { + if (!defined $h->{keepit} && + OpenBSD::PackageInfo::is_installed($h->pkgname)) { push(@l, $h); } } @@ -262,7 +263,6 @@ sub merge $set->{finished} = 1; # XXX and mark it as merged, for eventual updates $set->{merged} = $self; - $self->{updates} += $set->{updates}; } # then regen tracker info for $self $tracker->todo($self); -- cgit v1.2.3