From 322b37ac33e1e2516cb2e02e91225d49055d5259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 31 Oct 2008 10:25:47 +0000 Subject: [PATCH] #i10000# Correct regex in deliver.pl's linklib routine. --- solenv/bin/deliver.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index 485788019244..8eaea0f568df 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -244,8 +244,8 @@ sub do_linklib foreach $lib (@globbed_files) { $lib = basename($lib); - if ( $lib =~ /^(lib[\w-+]+(\.so|\.dylib))\.(\d+)\.(\d+)(\.(\d+))?$/ - || $lib =~ /^(lib[\w-+]+(\.so|\.dylib))\.(\d+)$/ ) + if ( $lib =~ /^(lib\S+(\.so|\.dylib))\.(\d+)\.(\d+)(\.(\d+))?$/ + || $lib =~ /^(lib\S+(\.so|\.dylib))\.(\d+)$/ ) { push(@{$globbed_hash{$1}}, $lib); } @@ -257,7 +257,7 @@ sub do_linklib foreach $lib_base ( sort keys %globbed_hash ) { $lib = get_latest_patchlevel(@{$globbed_hash{$lib_base}}); - if ( $lib =~ /^(lib[\w-+]+(\.so|\.dylib))\.(\d+)\.(\d+)(\.(\d+))?$/ ) + if ( $lib =~ /^(lib\S+(\.so|\.dylib))\.(\d+)\.(\d+)(\.(\d+))?$/ ) { $lib_major = "$lib_base.$3"; $long = 1;