summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/OpenBSD
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2009-12-05 10:54:12 +0000
committerMarc Espie <espie@cvs.openbsd.org>2009-12-05 10:54:12 +0000
commit468de125fb88e1183ff58c3af24712070aaac078 (patch)
treee7197bfb39f8e80515fb4efa4f148c129336b52d /usr.sbin/pkg_add/OpenBSD
parentdc4aea04ea679bfff765c4acadcc22a94ccbe466 (diff)
better quirks interface: pass the search object that was built, so we can
adjust it (eventually, pass the whole list ?)
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Update.pm12
1 files changed, 4 insertions, 8 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm
index 23f9f36a53b..ec501696dd1 100644
--- a/usr.sbin/pkg_add/OpenBSD/Update.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Update.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: Update.pm,v 1.110 2009/12/05 10:43:49 espie Exp $
+# $OpenBSD: Update.pm,v 1.111 2009/12/05 10:54:11 espie Exp $
#
# Copyright (c) 2004-2006 Marc Espie <espie@openbsd.org>
#
@@ -102,15 +102,11 @@ sub process_handle
}
my @search = ();
- my $s;
+ push(@search, OpenBSD::Search::Stem->split($pkgname));
+
if ($state->quirks) {
- $s = $state->quirks->search_object($h, $state);
- }
- if (!$s) {
- $s = OpenBSD::Search::Stem->split($pkgname);
+ $state->quirks->tweak_search(\@search, $h, $state);
}
- push(@search, $s);
-
my $found;
my $oldfound = 0;