summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-06-20 23:23:36 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-06-20 23:23:36 +0000
commit6bfd3e51da32108f8b15a1c7fb7af8ddf171b8ff (patch)
tree85be1204e51a2e01a7e74ec740f64d1b8ccf364b
parent36dcb5f4e0621ab907a3db207a220af0aee50657 (diff)
downloaddrakx-6bfd3e51da32108f8b15a1c7fb7af8ddf171b8ff.tar
drakx-6bfd3e51da32108f8b15a1c7fb7af8ddf171b8ff.tar.gz
drakx-6bfd3e51da32108f8b15a1c7fb7af8ddf171b8ff.tar.bz2
drakx-6bfd3e51da32108f8b15a1c7fb7af8ddf171b8ff.tar.xz
drakx-6bfd3e51da32108f8b15a1c7fb7af8ddf171b8ff.zip
fix undisplayed fields:
- if a per-class group exists, prefer it upon generic group - only care about current group fields, not about those of the group that has the same name in generic
-rwxr-xr-xperl-install/standalone/harddrake24
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index cb7698ee1..8c2aa553b 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -283,12 +283,12 @@ $tree->get_selection->signal_connect('changed' => sub {
$current_device->{$_}) . "\n\n", if_($_ eq 'driver' && $current_device->{$_} =~ /^unknown|^Bad:/, { foreground => 'indian red' }) ]
])
} sort keys %$current_device;
+ my %groups = map { if_(ref $groups{$_}, %{$groups{$_}}) } 'generic', $current_class;
my ($grouped, $ungrouped) = partition {
my $field = $_;
- member($field, map { @$_ } map { values %$_ } @groups{$current_class, 'generic'});
+ member($field, map { @$_ } values %groups);
} keys %device_fields;
my @formated;
- my %groups = map { if_(ref $groups{$_}, %{$groups{$_}}) } $current_class, 'generic';
foreach my $group (sort { $a eq N("Connection") } keys %groups) {
my @fields = @{$groups{$group}};
# have we at least a member in that group?