Author: jsrain Date: Wed Sep 9 14:58:20 2009 New Revision: 58600 URL: http://svn.opensuse.org/viewcvs/yast?rev=58600&view=rev Log: enhanced error reporting (bnc#533601) Modified: trunk/live-installer/VERSION trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/inst_live_doit.ycp Modified: trunk/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/VERSION?rev=58600&r1=58599&r2=58600&view=diff ============================================================================== --- trunk/live-installer/VERSION (original) +++ trunk/live-installer/VERSION Wed Sep 9 14:58:20 2009 @@ -1 +1 @@ -2.18.6 +2.18.7 Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-live-installer.changes?rev=58600&r1=58599&r2=58600&view=diff ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Wed Sep 9 14:58:20 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 9 14:54:15 CEST 2009 - jsrain@suse.cz + +- enhanced error reporting (bnc#533601) +- 2.18.7 + +------------------------------------------------------------------- Thu Aug 20 13:16:39 CEST 2009 - jsrain@suse.cz - fixed calling the workflow modules (bnc#532502) Modified: trunk/live-installer/src/inst_live_doit.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_doit.ycp?rev=58600&r1=58599&r2=58600&view=diff ============================================================================== --- trunk/live-installer/src/inst_live_doit.ycp (original) +++ trunk/live-installer/src/inst_live_doit.ycp Wed Sep 9 14:58:20 2009 @@ -12,6 +12,7 @@ import "ImageInstallation"; import "LiveInstaller"; import "SlideShow"; +import "Report"; Installation::destdir = "/mnt"; @@ -71,6 +72,7 @@ } integer index = 0; integer progress_step = (100-progress_start) * index / size (symlinks); + boolean ret = true; foreach (string link, string target, symlinks, { index = index + 1; SlideShow::StageProgress( progress_start, nil); @@ -90,13 +92,13 @@ link = mergestring (components, "/"); */ integer progress_done = progress_start + progress_step; - ImageInstallation::FileSystemCopy ("/" + target, sformat ("%1/%2", Installation::destdir, link), progress_start, progress_done); + ret = ImageInstallation::FileSystemCopy ("/" + target, sformat ("%1/%2", Installation::destdir, link), progress_start, progress_done) && ret; progress_start = progress_done; // Progress::Step (progress_start); SlideShow::StageProgress( progress_done, nil); SlideShow::SubProgress( 100, nil); }); - return true; + return ret; } /** @@ -106,9 +108,9 @@ boolean CopyRootImage (integer progress_start, integer progress_finish) { string tmpdir = (string)SCR::Read (.target.tmpdir); SCR::Execute (.target.bash, sformat ("/bin/cp -a %1/etc %2", Installation::destdir, tmpdir)); - ImageInstallation::FileSystemCopy ("/", Installation::destdir, progress_start, progress_finish); + boolean ret = ImageInstallation::FileSystemCopy ("/", Installation::destdir, progress_start, progress_finish); SCR::Execute (.target.bash, sformat ("/bin/cp -a %1/etc %2", tmpdir, Installation::destdir)); - return true; + return ret; } /* Progress::New( @@ -141,9 +143,19 @@ integer steps = size (copy_map) + 1; integer step_size = 95 / steps; -CopyRootImage (5, 5 + step_size); +if (! CopyRootImage (5, 5 + step_size)) +{ + // error report + Report::Error (_("Copying the live image to hard disk failed.")); + return `abort; +} //Progress::NextStageStep (10); -CopySymlinkedImage (copy_map, 5 + step_size); +if (! CopySymlinkedImage (copy_map, 5 + step_size)) +{ + // error report + Report::Error (_("Copying the live image to hard disk failed.")); + return `abort; +} //Progress::Finish(); //Progress::Title (_("Finished.")); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org