diff options
| author | Sergey Skvortsov <skv@FreeBSD.org> | 2009-11-23 15:58:01 +0000 |
|---|---|---|
| committer | Sergey Skvortsov <skv@FreeBSD.org> | 2009-11-23 15:58:01 +0000 |
| commit | 8e2c6eeca10100647dab8eef88b46c40951a4a34 (patch) | |
| tree | d5b83665c7080ebc661ca258bef6eb3823418e32 /lang/perl5.12/files/perl-after-upgrade | |
| parent | - Report a XSS vulnerability in net-mgmt/cacti port (diff) | |
perl-after-upgrade:
- simplify regexes
- catch lines in +CONTENTS like:
@unexec rmdir %D/lib/perl5/5.10.0 2>/dev/null || true
Notes
Notes:
svn path=/head/; revision=244689
Diffstat (limited to 'lang/perl5.12/files/perl-after-upgrade')
| -rw-r--r-- | lang/perl5.12/files/perl-after-upgrade | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lang/perl5.12/files/perl-after-upgrade b/lang/perl5.12/files/perl-after-upgrade index 7bb37386c4b9..2cd3c3fe8b21 100644 --- a/lang/perl5.12/files/perl-after-upgrade +++ b/lang/perl5.12/files/perl-after-upgrade @@ -530,9 +530,7 @@ while (my $pkg = $db->next) { $modified++ if $new_md5; } my $to = $from; - if ($to =~ s|/perl5/$PERL_VERSION_REGEX/|/perl5/$PERL_VERSION/|g - || $to =~ s|/perl5/site_perl/$PERL_VERSION_REGEX/|/perl5/site_perl/$PERL_VERSION/|g - ) { + if ($to =~ s|(/perl5/(?:site_perl/)?)$PERL_VERSION_REGEX|$1$PERL_VERSION|g) { if ($to ne $from) { my $dir = $to; $dir =~ s|/[^/]+$||; @@ -563,7 +561,7 @@ while (my $pkg = $db->next) { } } my $old = $_; - if (s|/perl5/$PERL_VERSION_REGEX/|/perl5/$PERL_VERSION/|g || s|/perl5/site_perl/$PERL_VERSION_REGEX/|/perl5/site_perl/$PERL_VERSION/|g) { + if (s|(/perl5/(?:site_perl/)?)$PERL_VERSION_REGEX|$1$PERL_VERSION|g) { if ($old ne $_) { $adjusted++; print STDERR "- adjust: $_\n" if $debug; |