diff options
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackageLocator.pm | 8 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Update.pm | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_info | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm index 821b1461d51..c7d822e0fe5 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.85 2010/01/09 14:55:53 espie Exp $ +# $OpenBSD: PackageLocator.pm,v 1.86 2010/01/09 15:10:17 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -52,7 +52,7 @@ sub path_parse ($pkgname, $path) = ($2, $1); } - return (OpenBSD::PackageRepository->new($path), $path, $pkgname); + return (OpenBSD::PackageRepository->new($path), $pkgname); } sub find @@ -61,7 +61,7 @@ sub find my $package; if (m/[\/\:]/o) { - my ($repository, undef, $pkgname) = $class->path_parse($_); + my ($repository, $pkgname) = $class->path_parse($_); $package = $repository->find($pkgname, $arch); if (defined $package) { $class->default_path->add($repository); @@ -78,7 +78,7 @@ sub grabPlist my $plist; if (m/[\/\:]/o) { - my ($repository, undef, $pkgname) = $class->path_parse($_); + my ($repository, $pkgname) = $class->path_parse($_); $plist = $repository->grabPlist($pkgname, $arch, $code); if (defined $plist) { $class->default_path->add($repository); diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm index c181cf74305..3000286bd55 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.131 2010/01/09 14:55:53 espie Exp $ +# $OpenBSD: Update.pm,v 1.132 2010/01/09 15:10:17 espie Exp $ # # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org> # @@ -109,7 +109,7 @@ sub process_handle # if (defined $plist->{url}) { # require OpenBSD::PackageLocator; # my $repo; -# ($repo, undef, undef) = OpenBSD::PackageLocator->path_parse($plist->{url}->name); +# ($repo, undef) = OpenBSD::PackageLocator->path_parse($plist->{url}->name); # $set->add_repositories($repo); # } my @search = (); @@ -278,7 +278,7 @@ sub process_hint2 if ($pkgname =~ m/[\/\:]/o) { require OpenBSD::PackageLocator; my $repo; - ($repo, undef, $pkgname) = OpenBSD::PackageLocator->path_parse($pkgname); + ($repo, $pkgname) = OpenBSD::PackageLocator->path_parse($pkgname); $set->add_repositories($repo); }; my $l = $state->updater->stem2location($set, $pkgname, $state, diff --git a/usr.sbin/pkg_add/pkg_info b/usr.sbin/pkg_add/pkg_info index 06565e7cf7f..4ad5ef146bd 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.89 2010/01/09 14:55:53 espie Exp $ +# $OpenBSD: pkg_info,v 1.90 2010/01/09 15:10:17 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -104,10 +104,10 @@ sub find_pkg } require OpenBSD::PackageLocator; - my ($repo, $path); + my $repo; if ($pkgname =~ m/[\/\:]/o) { - ($repo, $path, $pkgname) = + ($repo, $pkgname) = OpenBSD::PackageLocator->path_parse($pkgname); } else { $repo = 'OpenBSD::PackageLocator'; |