Author: locilka Date: Thu Jun 21 15:12:33 2007 New Revision: 38946 URL: http://svn.opensuse.org/viewcvs/yast?rev=38946&view=rev Log: - Enhanced SCR-Switch installation-debugger. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/include/scr_switch_debugger.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=38946&r1=38945&r2=38946&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Jun 21 15:12:33 2007 @@ -3,6 +3,7 @@ - Added handling for "Suggested Installation Sources" during the first stage installation, initial evrsion (FATE #300898). +- Enhanced SCR-Switch installation-debugger. ------------------------------------------------------------------- Wed Jun 20 13:12:10 CEST 2007 - locilka@suse.cz Modified: trunk/installation/src/include/scr_switch_debugger.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/scr_switch_debugger.ycp?rev=38946&r1=38945&r2=38946&view=diff ============================================================================== --- trunk/installation/src/include/scr_switch_debugger.ycp (original) +++ trunk/installation/src/include/scr_switch_debugger.ycp Thu Jun 21 15:12:33 2007 @@ -44,9 +44,12 @@ // chroot binary string test_chroot_binary = "/usr/bin/chroot"; + + // binary for 'any' command exists + string test_binary_exists = "/bin/ls"; // any command for the chroot command - string test_do_chroot = "ls -1 /"; + string test_do_chroot = "/bin/ls -1 /"; // y2base path string test_y2base = "/usr/lib/YaST2/bin/y2base"; @@ -148,6 +151,20 @@ return test_result; } + // checks whether the new SCR path exists + boolean RunSCRSwitchTest_BinaryExists () { + string exec_file = sformat ("%1%2", chroot_path, test_binary_exists); + boolean test_result = FileUtils::Exists (exec_file); + + ReportTest ( + // Test progress + sformat (_("Checking for binary %1..."), exec_file), + test_result + ); + + return test_result; + } + // tries to chroot boolean RunSCRSwitchTest_DoChroot () { map test = (map ) SCR::Execute (.target.bash_output, @@ -331,6 +348,7 @@ ReportProgress (_("System Checking")); if (! RunSCRSwitchTest_ChrootBinary()) return false; if (! RunSCRSwitchTest_ChrootPath()) return false; + if (! RunSCRSwitchTest_BinaryExists()) return false; if (! RunSCRSwitchTest_DoChroot()) return false; if (! RunSCRSwitchTest_Y2BASE()) return false; if (! RunSCRSwitchTest_DoRPMCheck()) return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org