repositories no longer need match

3 files changed, 5 insertions, 23 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm
index c69c041778c..f5c8c0c3e24 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.76 2008/10/20 10:25:16 espie Exp $
+# $OpenBSD: PackageLocator.pm,v 1.77 2010/01/09 09:37:45 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -114,12 +114,6 @@ sub cleanup
 	$pkgpath->cleanup;
 }
 
-sub match
-{
-	my ($class, @search) = @_;
-	return $pkgpath->match(@search);
-}
-
 sub match_locations
 {
 	my ($class, @search) = @_;
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm
index d54d804cd39..41333db5d43 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Source.pm,v 1.9 2010/01/05 11:31:07 espie Exp $
+# $OpenBSD: Source.pm,v 1.10 2010/01/09 09:37:45 espie Exp $
 #
 # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org>
 #
@@ -62,7 +62,7 @@ sub build_package
 	return $repo;
 }
 
-sub match
+sub match_locations
 {
 	my ($self, $search, @filters) = @_;
 	my $built;
@@ -71,7 +71,7 @@ sub match
 		$built = $self->build_package($search->{pkgpath});
 	}
 	if ($built) {
-		return $built->match($search, @filters);
+		return $built->match_locations($search, @filters);
 	}
 	return ();
 }
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm
index f073c13cff3..668f7ed0592 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.17 2009/04/19 14:58:32 espie Exp $
+# $OpenBSD: PackageRepositoryList.pm,v 1.18 2010/01/09 09:37:45 espie Exp $
 #
 # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org>
 #
@@ -54,18 +54,6 @@ sub grabPlist
 	return;
 }
 
-sub match
-{
-	my ($self, @search) = @_;
-	for my $repo (@$self) {
-		my @l = $repo->match(@search);
-		if (@l > 0) {
-			return @l;
-		}
-	}
-	return ();
-}
-
 sub match_locations
 {
 	my ($self, @search) = @_;