bind install fix, installation failed warn

1 files changed, 11 insertions, 6 deletions

diff --git a/drakwizard.pl b/drakwizard.pl
index 4df0ab72..0470bbf5 100755
--- a/drakwizard.pl
+++ b/drakwizard.pl
@@ -49,8 +49,8 @@ if (!defined($ARGV[0])) {
     my %wiz = (
 	       1 => [$prefix."web_wizard/web.wiz", "Apache"],
 	       2 => [$prefix."dhcp_wizard/dhcp.wiz", "Dhcp"],
-	       3 => [$prefix."dns_wizard/dns.wiz", "Dns (server)"],
-	       4 => [$prefix."client_wizard/client.wiz", "Dns (client)"],
+	       3 => [$prefix."dns_wizard/dns.wiz", "Dns (configuration)"],
+	       4 => [$prefix."client_wizard/client.wiz", "Dns (add client)"],
 	       5 => [$prefix."news_wizard/news.wiz", "News"],
 	       6 => [$prefix."nfs_wizard/nfs.wiz", "NFS"],
 	       7 => [$prefix."postfix_wizard/postfix.wiz", "Postfix"],
@@ -63,7 +63,7 @@ if (!defined($ARGV[0])) {
 		  _("Drakwizard wizard selection"),
 		  _("Please select a wizard"),
 		  [{ val => \$ARGV[0], list => [sort keys %wiz], format => sub { $wiz{$_}[1] }}]
-		  );
+		 );
     $ARGV[0] = $wiz{$ARGV[0]}[0]; 
 }
 
@@ -98,9 +98,14 @@ sub get_parameter {
 			       ($Wizard_title, $lib_script, $perl_module, $rpm, $Wizard_pix_up) = @{$leaf}{qw(wizardTitle libScript perlModule rpm defaultImage)};
 			       if ($rpm) {
 				   if (!$in->do_pkgs->is_installed($rpm)) {
-				       $in->ask_okcancel("error", _("%s is not installed\nClick \"Next\" to install or \"Cancel\" to quit", c::from_utf8($rpm))) and 
-					   $in->do_pkgs->install($rpm) or
-					   $in->exit;
+				       if ($in->ask_okcancel("error", _("%s is not installed\nClick \"Next\" to install or \"Cancel\" to quit", c::from_utf8($rpm)))) {
+					   if (!$in->do_pkgs->install($rpm eq 'bind' ? 'bind-9' : $rpm)) {
+					       $::Wizard_finished = 1;
+					       $in->ask_okcancel("error", _("installation failed"));
+					       $in->exit;
+					   }
+				       }
+				       else { $in->exit }
 				   }
 			       }
 			       if ($perl_module) {