diff options
Diffstat (limited to 'perl-install/Xconfig')
| -rw-r--r-- | perl-install/Xconfig/test.pm | 5 | ||||
| -rw-r--r-- | perl-install/Xconfig/xfree4.pm | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/Xconfig/test.pm b/perl-install/Xconfig/test.pm index d5b2f1334..38d9f9377 100644 --- a/perl-install/Xconfig/test.pm +++ b/perl-install/Xconfig/test.pm @@ -67,12 +67,14 @@ sub test { my $b = before_leaving { unlink $f_err }; if (!xtest(":9")) { - local $_; local *F; open F, $f_err; + + local $_; i: while (<F>) { if (Xconfig::card::using_xf4($card)) { if (/^\(EE\)/ && !/Disabling/ || /^Fatal\b/) { my @msg = !/error/ && $_ ; + local $_; while (<F>) { /reporting a problem/ and last; push @msg, $_; @@ -83,6 +85,7 @@ sub test { } else { if (/\b(error|not supported)\b/i) { my @msg = !/error/ && $_ ; + local $_; while (<F>) { /not fatal/ and last i; /^$/ and last; diff --git a/perl-install/Xconfig/xfree4.pm b/perl-install/Xconfig/xfree4.pm index 542226000..88cad5b06 100644 --- a/perl-install/Xconfig/xfree4.pm +++ b/perl-install/Xconfig/xfree4.pm @@ -49,7 +49,7 @@ sub new_mouse_sections { } (1 .. $nb_new); push @$layout, { val => qq("Mouse1" "CorePointer") }; - push @$layout, { val => qq("Mouse$_" "SendCoreEvents") } foreach (2 .. $nb_new); + push @$layout, { val => qq("Mouse$_" "SendCoreEvents") } foreach 2 .. $nb_new; @l; } |