diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-09-10 18:03:21 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-09-10 18:03:21 +0000 |
| commit | c2e36af114ae13c487ad48a822c45344fa6380c5 (patch) | |
| tree | a713a014873d88594eefe1e4762c19b09a9a664a | |
| parent | 5cfd3ce28cec8071920ac9a146e59b35824bb8aa (diff) | |
| download | drakx-backup-do-not-use-c2e36af114ae13c487ad48a822c45344fa6380c5.tar drakx-backup-do-not-use-c2e36af114ae13c487ad48a822c45344fa6380c5.tar.gz drakx-backup-do-not-use-c2e36af114ae13c487ad48a822c45344fa6380c5.tar.bz2 drakx-backup-do-not-use-c2e36af114ae13c487ad48a822c45344fa6380c5.tar.xz drakx-backup-do-not-use-c2e36af114ae13c487ad48a822c45344fa6380c5.zip | |
updated g_auto_install() for newer printerdrake interface.
| -rw-r--r-- | perl-install/install_any.pm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index a469d7121..d8cae4273 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -651,13 +651,11 @@ sub g_auto_install { exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang authentication mouse wacom netc timezone superuser intf keyboard users partitioning isUpgrade manualFstab nomouseprobe crypto security netcnx useSupermount autoExitInstall mkbootdisk); #- TODO modules bootloader if (my $printer = $::o->{printer}) { - $o->{printer}{$_} = $::o->{printer}{$_} foreach qw(SPOOLER TYPE str_type OPTIONS DBENTRY); + $o->{printer}{$_} = $::o->{printer}{$_} foreach qw(SPOOLER DEFAULT BROWSEPOLLADDR BROWSEPOLLPORT MANUALCUPSCONFIG); $o->{printer}{configured} = {}; foreach my $queue (keys %{$::o->{printer}{configured}}) { - my $val = $::o->{printer}{configured}{$queue}; - exists $val->{$_} and $o->{printer}{configured}{$queue}{$_} = $val->{$_} foreach qw(OPTIONS); - exists $val->{queuedata}{$_} and $o->{printer}{configured}{$queue}{queuedata}{$_} = $val->{queuedata}{$_} - foreach keys %{$val->{queuedata} || {}}; + my $val = $::o->{printer}{configured}{$queue}{queuedata}; + exists $val->{$_} and $o->{printer}{configured}{$queue}{queuedata}{$_} = $val->{$_} foreach keys %{$val || {}}; } } |