diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-10-11 09:44:07 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-10-11 09:44:07 +0000 |
| commit | 1468dee472bc65d9392308294bda67c57ca0df4c (patch) | |
| tree | a461cf3293788eae598750caa1331ce6dfcf0995 /usr.sbin/pkg_add/pkg | |
| parent | 2c34e29c4a7c2cca9f9c32582ffd22df136fb7d4 (diff) | |
split PackageName handling into PackageName stuff/PkgSpec matching.
Kill new method that isn't really used.
Name explicit splitstem() to get the stem of a packagename.
Adjust calls to the interface.
Diffstat (limited to 'usr.sbin/pkg_add/pkg')
| -rw-r--r-- | usr.sbin/pkg_add/pkg | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/pkg b/usr.sbin/pkg_add/pkg index c6ba86c6816..e0a630b178b 100644 --- a/usr.sbin/pkg_add/pkg +++ b/usr.sbin/pkg_add/pkg @@ -1,6 +1,6 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg,v 1.2 2004/08/06 07:51:17 espie Exp $ +# $OpenBSD: pkg,v 1.3 2004/10/11 09:44:06 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -23,11 +23,11 @@ use Getopt::Std; sub check_dependencies($) { eval { - require OpenBSD::PackageName; + require OpenBSD::PkgSpec; require OpenBSD::PackageInfo; }; my $dependency = shift; - my @m = OpenBSD::PackageName::pkgspec_match($dependency, + my @m = OpenBSD::PkgSpec::match($dependency, OpenBSD::PackageInfo::installed_packages()); return (@m != 0) ? 1 : 0; } |