summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2009-10-11 16:46:37 +0000
committerespie <espie@openbsd.org>2009-10-11 16:46:37 +0000
commit18d1dc26893775b2818da3243d1ddfc70839dd2b (patch)
treecde7339718e9e1b471f37806bfb9dee577a5735f
parentmakes source code fit on a 80-column display, no binary change. (diff)
downloadwireguard-openbsd-18d1dc26893775b2818da3243d1ddfc70839dd2b.tar.xz
wireguard-openbsd-18d1dc26893775b2818da3243d1ddfc70839dd2b.zip
need to save more stuff about updateset for complicated upgrade scenarios.
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Dependencies.pm13
1 files changed, 8 insertions, 5 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
index 3dbb0c27dc2..0d0b44d6a91 100644
--- a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: Dependencies.pm,v 1.67 2009/10/11 12:35:53 espie Exp $
+# $OpenBSD: Dependencies.pm,v 1.68 2009/10/11 16:46:37 espie Exp $
#
# Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org>
#
@@ -198,7 +198,7 @@ sub new
{
my ($class, $set) = @_;
bless {set => $set, plist => $set->handle->{plist},
- to_install => {}, deplist => [], to_register => {} }, $class;
+ to_install => {}, to_update => {}, deplist => [], to_register => {} }, $class;
}
sub dependencies
@@ -230,9 +230,12 @@ sub add_todo
require OpenBSD::PackageName;
for my $set (@extra) {
- my $fullname = $set->handle->{pkgname};
- $self->{to_install}->
- {OpenBSD::PackageName::url2pkgname($fullname)} = $set;
+ for my $n ($set->newer) {
+ $self->{to_install}->{OpenBSD::PackageName::url2pkgname($n->{pkgname})} = $set;
+ }
+ for my $n ($set->older) {
+ $self->{to_update}->{OpenBSD::PackageName::url2pkgname($n->{pkgname})} = $set;
+ }
}
}