diff options
| author | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2009-06-25 17:21:10 +0000 |
|---|---|---|
| committer | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2009-06-25 17:21:10 +0000 |
| commit | 813fab89ba424408da95b8be0351dfe3ac1e2856 (patch) | |
| tree | 511cbb9a69253882246e4d6bc6b7c1205a4baae7 /strip_and_check_elf_files | |
| parent | 34424e23adab68e8884c640affcd40e08018bec0 (diff) | |
| download | spec-helper-813fab89ba424408da95b8be0351dfe3ac1e2856.tar spec-helper-813fab89ba424408da95b8be0351dfe3ac1e2856.tar.gz spec-helper-813fab89ba424408da95b8be0351dfe3ac1e2856.tar.bz2 spec-helper-813fab89ba424408da95b8be0351dfe3ac1e2856.tar.xz spec-helper-813fab89ba424408da95b8be0351dfe3ac1e2856.zip | |
fix EXCLUDE_FROM_STRIP issue dealing with more than just one pattern, whichv0.30.5
would result in files being stripped even when they should've been excluded
(cause of mdv bug #51374)
Diffstat (limited to 'strip_and_check_elf_files')
| -rwxr-xr-x | strip_and_check_elf_files | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/strip_and_check_elf_files b/strip_and_check_elf_files index b11e099..c3c5301 100755 --- a/strip_and_check_elf_files +++ b/strip_and_check_elf_files @@ -22,8 +22,9 @@ sub strip_files { my @to_strip = (@shared_libs, @executables); if ($ENV{EXCLUDE_FROM_STRIP}) { - my $exclude_pattern = qr/$ENV{EXCLUDE_FROM_STRIP}/; - @to_strip = grep { !/$exclude_pattern/ } @to_strip; + my $exclude_pattern = join('|', split(/\s+/, $ENV{EXCLUDE_FROM_STRIP})); + my $compiled_pattern = qr/($exclude_pattern)/; + @to_strip = grep { !/$compiled_pattern/ } @to_strip; } system( |