diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2002-09-06 21:36:02 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2002-09-06 21:36:02 +0000 |
| commit | bf209b0d26153b1c8f4d51f26c20d60d9107e2f5 (patch) | |
| tree | 8596c6590c1f93a73c5cd081ce4831fc70d2f0b4 /perl-install/harddrake | |
| parent | 100f950ee539ce7a88e4ea39d487dfb019a8298f (diff) | |
| download | drakx-backup-do-not-use-bf209b0d26153b1c8f4d51f26c20d60d9107e2f5.tar drakx-backup-do-not-use-bf209b0d26153b1c8f4d51f26c20d60d9107e2f5.tar.gz drakx-backup-do-not-use-bf209b0d26153b1c8f4d51f26c20d60d9107e2f5.tar.bz2 drakx-backup-do-not-use-bf209b0d26153b1c8f4d51f26c20d60d9107e2f5.tar.xz drakx-backup-do-not-use-bf209b0d26153b1c8f4d51f26c20d60d9107e2f5.zip | |
- harddrake::data : consolidate common code in custom_id()
- do some detection in dm stage
- fix bad test
- display better name
Diffstat (limited to 'perl-install/harddrake')
| -rw-r--r-- | perl-install/harddrake/data.pm | 5 | ||||
| -rw-r--r-- | perl-install/harddrake/ui.pm | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index d88925014..0da8974fa 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -82,4 +82,9 @@ our @tree = ); +sub custom_id { + my ($device, $str) = @_; + defined($device->{device}) ? $device->{device} : (defined($device->{description}) ? $device->{description} : $str); +} + 1; diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm index 49b48caaf..e8feb1395 100644 --- a/perl-install/harddrake/ui.pm +++ b/perl-install/harddrake/ui.pm @@ -209,7 +209,7 @@ sub new { } foreach my $i (qw(vendor id subvendor subid pci_bus pci_device pci_function MOUSETYPE XMOUSETYPE unsafe val devfs_prefix wacom auxmouse)) { delete $_->{$i} } $_->{device} = '/dev/'.$_->{device} if exists $_->{device}; - my $custom_id = defined($_->{device}) ? $_->{device} : (defined($_->{description}) ? $_->{description} : $title); + my $custom_id = harddrake::data::custom_id($_, $title); my $hw_item = $tree->insert_node($hw_class_tree, $prev_item, [$custom_id ], 5, (undef) x 4, 1, 0); $tree->set_row_data($hw_item, [data => $_, configurator => $configurator ]); $tree->{data}{$custom_id} = $_; |