From 9042c69542e62f5acf18c4107a73ac9da68d5b8f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 21 Sep 2004 02:38:45 +0000
Subject: allow ignoring X config file when it contains errors

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

diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index f1ad91f41..f260d48b5 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -159,7 +159,14 @@ sub configure_chooser {
 
 sub configure_everything_or_configure_chooser {
     my ($in, $options, $auto, $o_keyboard, $o_mouse) = @_;
-    my $raw_X = Xconfig::xfree->read;
+    my $raw_X = eval { Xconfig::xfree->read };
+
+    if (!$raw_X) {
+	log::l("ERROR: bad X config file $@");
+	$in->ask_okcancel('',
+			  N("Your Xorg configuration file is broken, we will ignore it.")) or return;
+	$raw_X = [];
+    }
 
     if (is_empty_array_ref($raw_X)) {
 	$raw_X = Xconfig::default::configure($o_keyboard, $o_mouse);
-- 
cgit v1.2.1