summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2001-09-14 16:29:16 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2001-09-14 16:29:16 +0000
commit0f5bbac03cd5e5056ed6982dfdb5bcf02c843188 (patch)
tree7467341235a83ab17f3afbb48fd3d3d67ac5a25d
parent782d8368e52afccfed04ff1ae6a73742bf942fa4 (diff)
downloaddrakx-0f5bbac03cd5e5056ed6982dfdb5bcf02c843188.tar
drakx-0f5bbac03cd5e5056ed6982dfdb5bcf02c843188.tar.gz
drakx-0f5bbac03cd5e5056ed6982dfdb5bcf02c843188.tar.bz2
drakx-0f5bbac03cd5e5056ed6982dfdb5bcf02c843188.tar.xz
drakx-0f5bbac03cd5e5056ed6982dfdb5bcf02c843188.zip
Resolved conflict.
-rw-r--r--perl-install/printerdrake.pm7
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;