diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-09-16 16:22:56 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-09-16 16:22:56 +0000 |
| commit | 529bc9e93093d990ad48aa3e667038f646f9fc0c (patch) | |
| tree | 8caf66c7fa1860db0260bcf652f15ca206a87154 /perl-install | |
| parent | 99b8efa2abb0538c827ab72c3bf65e874afdd75b (diff) | |
| download | drakx-529bc9e93093d990ad48aa3e667038f646f9fc0c.tar drakx-529bc9e93093d990ad48aa3e667038f646f9fc0c.tar.gz drakx-529bc9e93093d990ad48aa3e667038f646f9fc0c.tar.bz2 drakx-529bc9e93093d990ad48aa3e667038f646f9fc0c.tar.xz drakx-529bc9e93093d990ad48aa3e667038f646f9fc0c.zip | |
remove useless "Autodetect printers" option
rationale: we don't detect anymore printers since commit r245200 on
2008-09-15 ("do not use anymore printerdrake and thus do not detect
printers anymore")
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rwxr-xr-x | perl-install/standalone/harddrake2 | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 406e01cfc..72f30e5af 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- harddrake2: + o remove useless "Autodetect printers" option + Version 14.44 - 14 September 2012 - drakbug: diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 43f857996..1d7d450a2 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -183,7 +183,6 @@ my %menus = ( ); my %menu_options = ( - 'PRINTERS_DETECTION' => [ $menus{options}, N("/Autodetect _printers") ], 'MODEMS_DETECTION' => [ $menus{options}, N("/Autodetect _modems") ], 'JAZZ_DETECTION' => [ $menus{options}, N("/Autodetect _jaz drives") ], 'PARALLEL_ZIP_DETECTION' => [ $menus{options}, N("/Autodetect parallel _zip drives") ], @@ -198,8 +197,6 @@ my @menu_items = ( [ N("/_File"), undef, undef, undef, '<Branch>' ], [ N("/_File") . N("/_Quit"), N("<control>Q"), \&quit_global, undef, '<Item>' ], - [ join('', @{$menu_options{PRINTERS_DETECTION}}), undef, - sub { $options{PRINTERS_DETECTION} = $check_boxes{PRINTERS_DETECTION}->get_active }, undef, '<CheckItem>' ], [ join('', @{$menu_options{MODEMS_DETECTION}}), undef, sub { $options{MODEMS_DETECTION} = $check_boxes{MODEMS_DETECTION}->get_active }, undef, '<CheckItem>' ], [ join('', @{$menu_options{JAZZ_DETECTION}}), undef, @@ -392,7 +389,6 @@ foreach my $hw_class (@harddrake::data::tree) { next if ref($detector) ne "CODE"; #skip class witouth detector next if $Ident =~ /(MODEM|PRINTER)/ && $::testing; next if $Ident =~ /JAZZ/ && !$options{JAZZ_DETECTION}; - next if $Ident =~ /PRINTER/ && !$options{PRINTERS_DETECTION}; $detect_devices::detect_serial_modem = 0 if $Ident =~ /MODEM/ && !$options{MODEMS_DETECTION}; my @devices = $detector->(\%options); |