diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-06-27 13:11:09 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-06-27 13:11:09 +0000 |
| commit | 4d21f93e21b57a8804aa724c858e07bacabd83e4 (patch) | |
| tree | 1d85485b8f54190a8b8a7d4934c3bce978fb9fd2 | |
| parent | a453987c62b2312e892498a4b6e2ef4841ddbb2b (diff) | |
| download | drakx-4d21f93e21b57a8804aa724c858e07bacabd83e4.tar drakx-4d21f93e21b57a8804aa724c858e07bacabd83e4.tar.gz drakx-4d21f93e21b57a8804aa724c858e07bacabd83e4.tar.bz2 drakx-4d21f93e21b57a8804aa724c858e07bacabd83e4.tar.xz drakx-4d21f93e21b57a8804aa724c858e07bacabd83e4.zip | |
- in auto_install when auto_install file is bad/missing, fail instead of
continuing normal install
- correctly detect bad auto_install files
| -rw-r--r-- | perl-install/install2.pm | 9 |
1 files changed, 7 insertions, 2 deletions
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"); } |