summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-12-19 20:49:36 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-12-19 20:50:35 +0100
commit9abdf206d39c49113f178ca5254fa1b9ed7a66ff (patch)
treefcbeeb59ee505fa4ec3d9101dd812ceb26aad88a
parent48ed2ed0bd33ba14f0b76f09df8d9969d34e2b78 (diff)
downloaddrakx-9abdf206d39c49113f178ca5254fa1b9ed7a66ff.tar
drakx-9abdf206d39c49113f178ca5254fa1b9ed7a66ff.tar.gz
drakx-9abdf206d39c49113f178ca5254fa1b9ed7a66ff.tar.bz2
drakx-9abdf206d39c49113f178ca5254fa1b9ed7a66ff.tar.xz
drakx-9abdf206d39c49113f178ca5254fa1b9ed7a66ff.zip
make code more explicit
-rwxr-xr-xperl-install/standalone/harddrake24
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 5b403c576..9210f5ca7 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -497,7 +497,9 @@ $tree->signal_connect(realize => sub { $tree->get_selection->select_path(Gtk3::T
$SIG{CHLD} = undef;
#local $SIG{CHLD} = sub {};
- if (my @packages = difference2([ pkgs::detect_hardware_packages($in->do_pkgs) ], [ qw(dmraid mdadm) ])) {
+ # do no try to install too generic hw packages:
+ my @blacklist = [ qw(dmraid mdadm) ];
+ if (my @packages = difference2([ pkgs::detect_hardware_packages($in->do_pkgs) ], @blacklist)) {
@packages = difference2(\@packages, [ $in->do_pkgs->are_installed(@packages) ]);
# we use uniq() because on biarch machines, we got packages twice:
my @packages2install = uniq($in->do_pkgs->are_available(@packages));