diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2007-05-19 09:18:56 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2007-05-19 09:18:56 +0000 |
| commit | 509a7c8b1892809536e34439daf35060025839d9 (patch) | |
| tree | 27ac7c8aaad70088281399e2a31cd474a17a2c7a /usr.sbin/pkg_add | |
| parent | 57e9a4bff63dbef53420fe9005018eba56217737 (diff) | |
don't pass srcpath around, since we don't use it.
Diffstat (limited to 'usr.sbin/pkg_add')
4 files changed, 11 insertions, 12 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm index 18be065e6c2..263e312a037 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageLocator.pm,v 1.69 2007/05/14 12:52:53 espie Exp $ +# $OpenBSD: PackageLocator.pm,v 1.70 2007/05/19 09:18:55 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -56,11 +56,10 @@ sub find my $class = shift; local $_ = shift; my $arch = shift; - my $srcpath = shift; if ($_ eq '-') { my $repository = OpenBSD::PackageRepository::Local::Pipe->_new('./'); - my $package = $repository->find(undef, $arch, $srcpath); + my $package = $repository->find(undef, $arch); return $package; } if (exists $packages{$_}) { @@ -69,12 +68,12 @@ sub find my $package; if (m/\//) { my ($repository, undef, $pkgname) = path_parse($_); - $package = $repository->find($pkgname, $arch, $srcpath); + $package = $repository->find($pkgname, $arch); if (defined $package) { $pkgpath->add($repository); } } else { - $package = $pkgpath->find($_, $arch, $srcpath); + $package = $pkgpath->find($_, $arch); } $packages{$_} = $package if defined($package); return $package; diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm index 64a98a071b8..da1296893bf 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageRepository.pm,v 1.37 2007/05/18 13:22:06 espie Exp $ +# $OpenBSD: PackageRepository.pm,v 1.38 2007/05/19 09:18:55 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -182,7 +182,7 @@ sub open sub find { - my ($repository, $name, $arch, $srcpath) = @_; + my ($repository, $name, $arch) = @_; my $self = OpenBSD::PackageLocation->new($repository, $name, $arch); return $self->openPackage; diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm index 31d0a811ac4..024bf06e4ba 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Installed.pm,v 1.8 2007/05/18 12:28:26 espie Exp $ +# $OpenBSD: Installed.pm,v 1.9 2007/05/19 09:18:55 espie Exp $ # # Copyright (c) 2007 Marc Espie <espie@openbsd.org> # @@ -71,7 +71,7 @@ sub relative_url sub find { - my ($repository, $name, $arch, $srcpath) = @_; + my ($repository, $name, $arch) = @_; my $self; if (is_installed($name)) { diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm index 91973257aad..1a882107ed5 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageRepositoryList.pm,v 1.14 2007/05/14 12:52:53 espie Exp $ +# $OpenBSD: PackageRepositoryList.pm,v 1.15 2007/05/19 09:18:55 espie Exp $ # # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org> # @@ -34,10 +34,10 @@ sub add sub find { - my ($self, $pkgname, $arch, $srcpath) = @_; + my ($self, $pkgname, $arch) = @_; for my $repo (@{$self->{list}}) { - my $pkg = $repo->find($pkgname, $arch, $srcpath); + my $pkg = $repo->find($pkgname, $arch); return $pkg if defined $pkg; } return; |