From 0f5bbac03cd5e5056ed6982dfdb5bcf02c843188 Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Fri, 14 Sep 2001 16:29:16 +0000 Subject: Resolved conflict. --- perl-install/printerdrake.pm | 7 ++++--- 1 file 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; -- cgit v1.2.1