summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2009-10-12 10:57:28 +0000
committerMarc Espie <espie@cvs.openbsd.org>2009-10-12 10:57:28 +0000
commit47aa515d242cd8d73cdf101da85bd8dc52deb3f8 (patch)
treec6c1e3799f34d995a50bcee3725b0bbc5904f976
parent40c6298d6b72f9115d128af279ef618475d9c434 (diff)
looking through installed packages is cool, but remember to filter out
older stuff in the updateset...
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Dependencies.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
index 0d0b44d6a91..f71b9990a2e 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.68 2009/10/11 16:46:37 espie Exp $
+# $OpenBSD: Dependencies.pm,v 1.69 2009/10/12 10:57:27 espie Exp $
#
# Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org>
#
@@ -291,7 +291,11 @@ sub solve_dependency
}
}
- $v = find_candidate($dep->spec, installed_packages());
+ my @l = installed_packages();
+ for my $o ($self->{set}->older_names) {
+ @l = grep {$_ ne $o} @l;
+ }
+ $v = find_candidate($dep->spec, @l);
if ($v) {
return $v;
}