summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-12-12 19:54:48 +0000
committerThierry Vignaud <tv@mageia.org>2011-12-12 19:54:48 +0000
commitb4df04aae528801847e2b2849a7832803bdbb49e (patch)
treeb23638084a26e78c07cb665fd4b6c7d3d35afbd9
parent1908474fc96ce067a52d70c692f520c571197ee1 (diff)
downloaddrakx-kbd-mouse-x11-b4df04aae528801847e2b2849a7832803bdbb49e.tar
drakx-kbd-mouse-x11-b4df04aae528801847e2b2849a7832803bdbb49e.tar.gz
drakx-kbd-mouse-x11-b4df04aae528801847e2b2849a7832803bdbb49e.tar.bz2
drakx-kbd-mouse-x11-b4df04aae528801847e2b2849a7832803bdbb49e.tar.xz
drakx-kbd-mouse-x11-b4df04aae528801847e2b2849a7832803bdbb49e.zip
(may_use_Driver2) simplify (more generic, more readable)
-rw-r--r--lib/Xconfig/proprietary.pm6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Xconfig/proprietary.pm b/lib/Xconfig/proprietary.pm
index 5dcf17d..756387c 100644
--- a/lib/Xconfig/proprietary.pm
+++ b/lib/Xconfig/proprietary.pm
@@ -81,10 +81,8 @@ sub may_use_Driver2 {
my $card2 = {
%$card,
- $card->{Driver2} =~ /^nvidia(.*)/ ?
- (Driver => 'nvidia', DriverVersion => $1) :
- $card->{Driver2} =~ /^fglrx(.*)/ ?
- (Driver => 'fglrx', DriverVersion => $1) :
+ $card->{Driver2} =~ /^(fglrx|nvidia)(.*)/ ?
+ (Driver => $1, DriverVersion => $2) :
(Driver => $card->{Driver2}),
};