diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2007-05-18 12:28:27 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2007-05-18 12:28:27 +0000 |
| commit | c0024db4cb24d62dae405a0b4d26fd754d43a7fd (patch) | |
| tree | 2064e4ab79e3659ae6e951fdeaccee1601570c4d /usr.sbin | |
| parent | 179807bfa177761d763cbb196e478bd5c73abd7f (diff) | |
normalize installed names
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_info | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm index 1f4cd0b35b7..31d0a811ac4 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.7 2007/05/17 18:52:58 espie Exp $ +# $OpenBSD: Installed.pm,v 1.8 2007/05/18 12:28:26 espie Exp $ # # Copyright (c) 2007 Marc Espie <espie@openbsd.org> # @@ -53,7 +53,7 @@ sub urlscheme } use OpenBSD::PackageInfo (qw(is_installed installed_info - installed_packages installed_stems)); + installed_packages installed_stems installed_name)); my $singleton = bless {}, __PACKAGE__; my $s2 = bless {all => 1}, __PACKAGE__; @@ -77,7 +77,7 @@ sub find if (is_installed($name)) { require OpenBSD::PackageLocation; - $self = OpenBSD::PackageLocation->new($repository, $name); + $self = OpenBSD::PackageLocation->new($repository, installed_name($name)); $self->{dir} = installed_info($name); } return $self; diff --git a/usr.sbin/pkg_add/pkg_info b/usr.sbin/pkg_add/pkg_info index 4ead4e14c60..16614b71e0d 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.55 2007/05/15 19:02:26 espie Exp $ +# $OpenBSD: pkg_info,v 1.56 2007/05/18 12:28:26 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -69,7 +69,7 @@ sub find_pkg { my ($pkgname, $code) = @_; require OpenBSD::PackageRepository::Installed; - my $repo = OpenBSD::PackageRepository::Installed->new(); + my $repo = OpenBSD::PackageRepository::Installed->new; my $pkg; $pkg = $repo->find($pkgname); |