diff options
| -rw-r--r-- | rescue/NEWS | 1 | ||||
| -rwxr-xr-x | tools/install-xml-file-list | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/rescue/NEWS b/rescue/NEWS index a20f773f6..4d7fdc8b5 100644 --- a/rescue/NEWS +++ b/rescue/NEWS @@ -1,4 +1,5 @@ - add missing perl bits +- fix collecting needed perl files with glibc-2.26 Version 1.59 - 26 August 2018 by Thomas Backlund diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list index 0fc8f7a76..64c70b9c6 100755 --- a/tools/install-xml-file-list +++ b/tools/install-xml-file-list @@ -160,7 +160,7 @@ sub collect_needed_perl_files { my (%local, %global); foreach my $script (@scripts) { foreach (`strace -efile perl -cw -I$local_rep $script 2>&1`) { - my ($f) = /^open\("(.*?)",.*\)\s*=\s*\d+$/ or next; + my ($f) = /^open(?:at\([^,]*, |)"(.*?)",.*\)\s*=\s*\d+$/ or next; if ($f =~ m!^\Q$local_rep\E/(.*)!) { $local{$1} = 1; } elsif (begins_with($f, '/dev/')) { |