Blame devscripts_ipc-run.patch
|
 |
657eda7 |
diff -rupN devscripts-2.15.9/scripts/licensecheck.pl devscripts-2.15.9-new/scripts/licensecheck.pl
|
|
|
657eda7 |
--- devscripts-2.15.9/scripts/licensecheck.pl 2015-10-06 03:00:34.000000000 +0200
|
|
|
657eda7 |
+++ devscripts-2.15.9-new/scripts/licensecheck.pl 2015-10-09 12:51:12.425215534 +0200
|
|
|
657eda7 |
@@ -157,7 +157,7 @@ use warnings;
|
|
|
657eda7 |
use warnings qw< FATAL utf8 >;
|
|
|
657eda7 |
use Encode qw/decode/;
|
|
|
657eda7 |
|
|
|
657eda7 |
-use Dpkg::IPC qw(spawn);
|
|
|
657eda7 |
+use IPC::Run qw(run);
|
|
|
657eda7 |
use Getopt::Long qw(:config gnu_getopt);
|
|
|
657eda7 |
use File::Basename;
|
|
|
657eda7 |
|
|
|
657eda7 |
@@ -337,11 +337,7 @@ while (@files) {
|
|
|
657eda7 |
|
|
|
657eda7 |
# Encode::Guess does not work well, use good old file command to get file encoding
|
|
|
657eda7 |
my $mime;
|
|
|
657eda7 |
- spawn(exec => ['file', '--brief', '--mime', '--dereference', '--', $file],
|
|
|
657eda7 |
- to_string => \$mime,
|
|
|
657eda7 |
- error_to_file => '/dev/null',
|
|
|
657eda7 |
- nocheck => 1,
|
|
|
657eda7 |
- wait_child => 1);
|
|
|
657eda7 |
+ run [qw(file --brief --mime --dereference), $file], \undef, \$mime;
|
|
|
657eda7 |
my $charset ;
|
|
|
657eda7 |
if ($mime =~ m/; charset=((?!binary)(?!unknown)[\w-]+)/) {
|
|
|
657eda7 |
$charset = $1;
|