summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2007-05-15 19:02:27 +0000
committerMarc Espie <espie@cvs.openbsd.org>2007-05-15 19:02:27 +0000
commitb20a27a5d8705aab699f34d88e11460c2f5794f7 (patch)
tree9152050119427568dd620a16bd5258cbb8155390 /usr.sbin
parent6d46f071808b730d8f0858ab841be75589a1b62e (diff)
require the right code at the right location.
problem noticed by deanna@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_add/pkg_info7
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/pkg_info b/usr.sbin/pkg_add/pkg_info
index a357523d01a..4ead4e14c60 100644
--- a/usr.sbin/pkg_add/pkg_info
+++ b/usr.sbin/pkg_add/pkg_info
@@ -1,6 +1,6 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: pkg_info,v 1.54 2007/05/14 11:02:14 espie Exp $
+# $OpenBSD: pkg_info,v 1.55 2007/05/15 19:02:26 espie Exp $
#
# Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
#
@@ -68,7 +68,7 @@ my $pkgs = 0;
sub find_pkg
{
my ($pkgname, $code) = @_;
- require OpenBSD::PackageLocator;
+ require OpenBSD::PackageRepository::Installed;
my $repo = OpenBSD::PackageRepository::Installed->new();
my $pkg;
@@ -78,6 +78,7 @@ sub find_pkg
return;
}
if (OpenBSD::PackageName::is_stem($pkgname)) {
+ require OpenBSD::Search;
my @l = sort ($repo->match(OpenBSD::Search::Stem->new($pkgname)));
if (@l != 0) {
for my $p (@l) {
@@ -87,6 +88,8 @@ sub find_pkg
}
}
+ require OpenBSD::PackageLocator;
+
$pkg = OpenBSD::PackageLocator->find($pkgname);
if (defined $pkg) {
&$code($pkgname, $pkg);