From 0619a67bed971c9c23bf0d0afe19af33b716dee6 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 12 Feb 2004 20:20:40 +0000
Subject: handle case where rpm can't be found (eg: XFree86-SVGA for xfree3)
 (part of bugzilla #7786)

---
 perl-install/Xconfig/card.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index 9496c9777..a483365d4 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -298,6 +298,7 @@ sub configure {
 	}
     }
     if (!$auto) {
+      card_config__not_listed:
 	card_config__not_listed($in, $cards[0], $options) or return;
     }
 
@@ -305,7 +306,12 @@ sub configure {
 
     xfree_and_glx_choose($in, $card, $auto) or return;
 
-    $card->{prog} = install_server($card, $options, $do_pkgs);
+    eval {
+	$card->{prog} = install_server($card, $options, $do_pkgs);
+    } or do {
+	$in->ask_warn('', N("Can't install XFree package: %s", $@));
+	goto card_config__not_listed;
+    };
     
     if ($card->{needVideoRam} && !$card->{VideoRam}) {
 	if ($auto) {
-- 
cgit v1.2.1