diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2001-09-14 16:29:16 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2001-09-14 16:29:16 +0000 |
| commit | 0f5bbac03cd5e5056ed6982dfdb5bcf02c843188 (patch) | |
| tree | 7467341235a83ab17f3afbb48fd3d3d67ac5a25d | |
| parent | 782d8368e52afccfed04ff1ae6a73742bf942fa4 (diff) | |
| download | drakx-backup-do-not-use-0f5bbac03cd5e5056ed6982dfdb5bcf02c843188.tar drakx-backup-do-not-use-0f5bbac03cd5e5056ed6982dfdb5bcf02c843188.tar.gz drakx-backup-do-not-use-0f5bbac03cd5e5056ed6982dfdb5bcf02c843188.tar.bz2 drakx-backup-do-not-use-0f5bbac03cd5e5056ed6982dfdb5bcf02c843188.tar.xz drakx-backup-do-not-use-0f5bbac03cd5e5056ed6982dfdb5bcf02c843188.zip | |
Resolved conflict.
| -rw-r--r-- | perl-install/printerdrake.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index 4fe9471c5..f436ab14a 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -1578,10 +1578,11 @@ sub main { # This entry and the check for this entry have to use # the same translation to work properly my $spoolerentry = _("Printing system: "); - # Show a queue list window when there is at least one queue - # or when we are in expert mode + # Show a queue list window when there is at least one queue, + # when we are in expert mode, or when we are not in the + # installation. unless ((%{$printer->{configured} || {}} == ()) && - (!$::expert)) { + (!$::expert) && ($::isInstall)) { # Cancelling the printer type dialog should leed to this # dialog $continue = 1; |