summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2016-01-25 00:23:02 +0000
committerPascal Terjan <pterjan@gmail.com>2016-01-25 00:23:02 +0000
commitc6f18838bbd86300d1bf1e95c3ec4415cbab7c99 (patch)
tree3f4b966d48f248e3462d31ccb3091d85ba0a934b
parent292383d8ca48463b06fb3c3a8192f8e59d1274c9 (diff)
downloaddrakx-c6f18838bbd86300d1bf1e95c3ec4415cbab7c99.tar
drakx-c6f18838bbd86300d1bf1e95c3ec4415cbab7c99.tar.gz
drakx-c6f18838bbd86300d1bf1e95c3ec4415cbab7c99.tar.bz2
drakx-c6f18838bbd86300d1bf1e95c3ec4415cbab7c99.tar.xz
drakx-c6f18838bbd86300d1bf1e95c3ec4415cbab7c99.zip
Fix a crash in detect_devices on non x86
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/detect_devices.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 1ed2ccab3..c93026a6f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- detect_devices:
+ o fix a crash on non x86
+
Version 17.15 - 16 January 2016
- diskdrake:
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 133a0b1f4..2b3ba711b 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -1154,7 +1154,7 @@ Cache the result of c::dmi_probe() (aka C<dmidecode>) and return the list of ite
sub dmi_probe() {
state $dmi_probe;
if (arch() !~ /86/) {
- return [];
+ return ();
}
$dmi_probe ||= $> ? [] : [ c::dmi_probe() ];
@$dmi_probe;