summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2003-09-09 14:49:11 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2003-09-09 14:49:11 +0000
commit414e228c81f66a2cd05b7a9af62fe4ef4b589589 (patch)
tree12d5dced048c6cc38a3e5e592b9b63d0043e15ba
parenta1b458891b64e9531a8fa85872607c662b14454b (diff)
downloaddrakx-backup-do-not-use-414e228c81f66a2cd05b7a9af62fe4ef4b589589.tar
drakx-backup-do-not-use-414e228c81f66a2cd05b7a9af62fe4ef4b589589.tar.gz
drakx-backup-do-not-use-414e228c81f66a2cd05b7a9af62fe4ef4b589589.tar.bz2
drakx-backup-do-not-use-414e228c81f66a2cd05b7a9af62fe4ef4b589589.tar.xz
drakx-backup-do-not-use-414e228c81f66a2cd05b7a9af62fe4ef4b589589.zip
Fixed bug #5423: Some option settings were not be recognized or changed.
-rw-r--r--perl-install/printer/printerdrake.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index d8ce1472d..648028b10 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -2634,7 +2634,7 @@ You should make sure that the page size and the ink type/printing mode (if avail
push(@{$choicelists[$i]}, $choice->{comment});
push(@{$shortchoicelists[$i]}, $choice->{value});
if ($choice->{value} eq $optshortdefault) {
- push(@userinputs, $choice->{comment});
+ $userinputs[$i] = $choice->{comment};
}
}
push(@widgets,
@@ -2745,6 +2745,9 @@ You should make sure that the page size and the ink type/printing mode (if avail
# line arguments
@{$printer->{currentqueue}{options}} = ();
for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
+ # We did not show hidden options, so we do not have user input
+ # to add to the option list
+ next if $printer->{ARGS}[$i]{hidden};
push(@{$printer->{currentqueue}{options}}, "-o");
if ($printer->{ARGS}[$i]{type} eq 'enum') {
# enumerated option