summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2007-05-01 19:41:38 +0000
committerMarc Espie <espie@cvs.openbsd.org>2007-05-01 19:41:38 +0000
commitb1dbee3dca382b1067613841d4a88779e2c2b4b6 (patch)
treed900aaf096a3a3aaec54031c10452727de0cfe76
parent5917a4a2ea51769e5620e10629e771c0d41e6984 (diff)
kill code for handling old style dependencies.
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Dependencies.pm14
1 files changed, 3 insertions, 11 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
index a8c0b3ea717..e705943c295 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.7 2007/04/15 10:17:29 espie Exp $
+# $OpenBSD: Dependencies.pm,v 1.8 2007/05/01 19:41:37 espie Exp $
#
# Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org>
#
@@ -40,17 +40,9 @@ sub solve
}
my @avail;
- # do simple old style pkgdep first
- my @deps = ();
- for my $dep (@{$plist->{pkgdep}}) {
- if (!is_installed($dep->{name})) {
- push(@deps, $dep->{name});
- }
- $to_register->{$dep->{name}} = 1;
- }
- for my $dep (@{$plist->{depend}}, @{$plist->{newdepend}}, @{$plist->{libdepend}}) {
- next if defined $dep->{name} and $dep->{name} ne $plist->pkgname();
+ my @deps;
+ for my $dep (@{$plist->{depend}}) {
my @candidates;
if ($state->{replace}) {
# try against list of packages to install