From 4d21f93e21b57a8804aa724c858e07bacabd83e4 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 27 Jun 2001 13:11:09 +0000 Subject: - in auto_install when auto_install file is bad/missing, fail instead of continuing normal install - correctly detect bad auto_install files --- perl-install/install2.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'perl-install/install2.pm') diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 3f67073f7..e75dcc57c 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -462,8 +462,13 @@ sub main { require install_steps_auto_install; eval { $o = $::o = install_any::loadO($o, $::auto_install) }; if ($@) { - log::l("error using auto_install, continuing"); - undef $::auto_install; + if ($o->{useless_thing_accepted}) { #- Pixel's hack to be able to fail through + log::l("error using auto_install, continuing"); + undef $::auto_install; + } else { + print "Error using auto_install\n$@\n"; + install_steps_auto_install::errorInStep(); + } } else { log::l("auto install config file loaded successfully"); } -- cgit v1.2.1