diff options
| author |   espie <espie@openbsd.org> | 2007-06-04 16:13:30 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2007-06-04 16:13:30 +0000 |
| commit | 19501525e82e74643deb9fdeac7ce478ea07bc30 (patch) | |
| tree | 6ef04a14066122eb843496668a6b149966d6c01c | |
| parent | add a lib parsing routine to PackingElement::Lib so I don't have to (diff) | |
| download | wireguard-openbsd-19501525e82e74643deb9fdeac7ce478ea07bc30.tar.xz wireguard-openbsd-19501525e82e74643deb9fdeac7ce478ea07bc30.zip | |
stricter regexp for libraries.
Put the directory *last* as it can be empty, which breaks havoc with tests.
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm index add6d058208..01c2a546262 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingElement.pm,v 1.130 2007/06/04 15:57:09 espie Exp $ +# $OpenBSD: PackingElement.pm,v 1.131 2007/06/04 16:13:30 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -498,8 +498,8 @@ sub ensure_ldconfig sub parse { my ($self, $filename) = @_; - if ($filename =~ m/^(.*)\/?lib(.*?)\.so\.(\d+)\.(\d+)$/o) { - return ($1, $2, $3, $4); + if ($filename =~ m/^(.*?)\/?lib([^\/]+)\.so\.(\d+)\.(\d+)$/o) { + return ($2, $3, $4, $1); } else { return undef; } |