diff options
Diffstat (limited to 'usr.sbin/pkg_add')
-rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Dependencies.pm | 4 | ||||
-rw-r--r-- | usr.sbin/pkg_add/pkg_add | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm index d5b0448966c..f61fe00f886 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.73 2009/10/15 18:40:32 espie Exp $ +# $OpenBSD: Dependencies.pm,v 1.74 2009/10/15 20:51:28 espie Exp $ # # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org> # @@ -302,7 +302,7 @@ sub solve_dependency sub solve_depends { - my ($self, $state, @extra) = @_; + my ($self, $state) = @_; for my $package ($self->{set}->newer) { for my $dep (@{$package->{plist}->{depend}}) { diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index c42394172f5..1688014c229 100644 --- a/usr.sbin/pkg_add/pkg_add +++ b/usr.sbin/pkg_add/pkg_add @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_add,v 1.355 2009/10/15 18:32:11 espie Exp $ +# $OpenBSD: pkg_add,v 1.356 2009/10/15 20:51:28 espie Exp $ # # Copyright (c) 2003-2009 Marc Espie <espie@openbsd.org> # @@ -470,7 +470,7 @@ sub install_set } if (!defined $set->{solver}) { $set->{solver} = OpenBSD::Dependencies::Solver->new($set); - my @deps = $set->{solver}->solve_depends($state, @todo); + my @deps = $set->{solver}->solve_depends($state); if ($state->{verbose}) { $set->{solver}->dump; } |