diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-12-12 17:08:08 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-12-12 17:08:08 +0000 |
| commit | f098ff01389be6d00aac9c1d696f3d8346d92f33 (patch) | |
| tree | 7d2ee2a89b01a4eaa59c2f78e593a4cde85a910b /usr.sbin/pkg_add/OpenBSD/UpdateSet.pm | |
| parent | 2a82312ee8b30ae2f2bdcd0f40587194dee6ee0d (diff) | |
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)
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/UpdateSet.pm')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/UpdateSet.pm | 6 |
1 files changed, 3 insertions, 3 deletions
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 <espie@openbsd.org> # @@ -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); |