diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2007-06-04 18:55:48 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2007-06-04 18:55:48 +0000 |
| commit | 607d7d3def74c8ae4ad6591c8410d85773d80ff6 (patch) | |
| tree | 7fa9c0641f2f8108effe49d0e269c1cd424c10ef /usr.sbin/pkg_add/OpenBSD | |
| parent | 25d82b9da93421ba1710254be1ee6d96ef6a43cc (diff) | |
a few missed $' / $`
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Add.pm | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackageLocation.pm | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackageRepository.pm | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm index cdf4a041e70..6a45b57cac3 100644 --- a/usr.sbin/pkg_add/OpenBSD/Add.pm +++ b/usr.sbin/pkg_add/OpenBSD/Add.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Add.pm,v 1.71 2007/06/04 14:40:39 espie Exp $ +# $OpenBSD: Add.pm,v 1.72 2007/06/04 18:55:47 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -204,8 +204,8 @@ sub add_entry my $f = shift; my $v = shift; next if !defined $v or $v eq ''; - if ($v =~ m/^\!/o) { - push(@$l, $f, $'); + if ($v =~ m/^\!(.*)$/o) { + push(@$l, $f, $1); } else { push(@$l, $f, $v); } diff --git a/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm b/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm index 5792fc6c7b3..3541a71f36b 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageLocation.pm,v 1.12 2007/06/04 14:40:39 espie Exp $ +# $OpenBSD: PackageLocation.pm,v 1.13 2007/06/04 18:55:47 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -155,10 +155,10 @@ sub openPackage # maybe it's a fat package. while (my $e = $self->intNext) { - unless ($e->{name} =~ m/\/\+CONTENTS$/o) { + unless ($e->{name} =~ m/^(.*)\/\+CONTENTS$/o) { last; } - my $prefix = $`; + my $prefix = $1; my $contents = $e->contents; require OpenBSD::PackingList; diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm index 7e699d3f907..101120f6843 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageRepository.pm,v 1.41 2007/06/04 18:52:02 espie Exp $ +# $OpenBSD: PackageRepository.pm,v 1.42 2007/06/04 18:55:47 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -236,9 +236,9 @@ sub list my $dname = $self->{baseurl}; opendir(my $dir, $dname) or return $l; while (my $e = readdir $dir) { - next unless $e =~ m/\.tgz$/o; + next unless $e =~ m/^(.*)\.tgz$/o; next unless -f "$dname/$e"; - push(@$l, $`); + push(@$l, $1); } close($dir); return $l; |