Author: jsrain Date: Wed Sep 9 14:50:18 2009 New Revision: 58598 URL: http://svn.opensuse.org/viewcvs/yast?rev=58598&view=rev Log: better error handling for image installation (bnc#533601) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=58598&r1=58597&r2=58598&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Wed Sep 9 14:50:18 2009 @@ -1 +1 @@ -2.18.24 +2.18.25 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=58598&r1=58597&r2=58598&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Sep 9 14:50:18 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 9 14:33:14 CEST 2009 - jsrain@suse.cz + +- better error handling for image installation (bnc#533601) +- 2.18.25 + +------------------------------------------------------------------- Fri Sep 4 19:00:27 CEST 2009 - kmachalkova@suse.cz - Introducing unique IDs to unambiguously identify AC steps and Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageInstallation.ycp?rev=58598&r1=58597&r2=58598&view=diff ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Wed Sep 9 14:50:18 2009 @@ -955,7 +955,8 @@ } } - y2milestone ("Result: %1", SCR::Read (.process.status, process)); + integer copy_result = (integer)SCR::Read (.process.status, process); + y2milestone ("Result: %1", copy_result); SCR::Execute (.target.remove, tmp_pipe1); SCR::Execute (.target.remove, tmp_pipe2); cmd = sformat ("chown --reference=%1 %2; chmod --reference=%1 %2", @@ -963,7 +964,7 @@ y2milestone ("Executing %1", cmd); out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Result: %1", out); - return out["exit"]:-1 == 0; + return out["exit"]:-1 == 0 && copy_result == 0; } // --> Storing and restoring states -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org