summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-12-11 11:47:25 +0000
committerThierry Vignaud <tv@mageia.org>2011-12-11 11:47:25 +0000
commit31258ddf404a255c28d8447a224f03fee09afc5b (patch)
treed16d3bbc8abab01eb07cc3c10cb1c4208d8f4b2e
parent3fd95ad88603f0eb89493d82f64a157042680324 (diff)
downloaddrakx-31258ddf404a255c28d8447a224f03fee09afc5b.tar
drakx-31258ddf404a255c28d8447a224f03fee09afc5b.tar.gz
drakx-31258ddf404a255c28d8447a224f03fee09afc5b.tar.bz2
drakx-31258ddf404a255c28d8447a224f03fee09afc5b.tar.xz
drakx-31258ddf404a255c28d8447a224f03fee09afc5b.zip
fix crash after mismerge (mga#3696)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/harddrake/data.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 00b7bb3b6..f84979e81 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
- fix $HOME for all when runing as another user instead of root (mga#287)
+- harddrake: fix crash after mismerge (mga#3696)
Version 13.72 - 10 December 2011
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 8be28c424..afad37117 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -384,7 +384,7 @@ our @tree =
string => N("Bluetooth devices"),
icon => "hw_network.png",
configurator => "",
- detector => sub { f(detect_devices::probe_category('bus/bluetooth')), f(grep { $_->{description} =~ /Bluetooth Dongle/ }) },
+ detector => sub { f(detect_devices::probe_category('bus/bluetooth')), f(grep { $_->{description} =~ /Bluetooth Dongle/ } @$devices) },
checked_on_boot => 1,
},