Author: locilka Date: Fri Jan 16 15:54:20 2009 New Revision: 54709 URL: http://svn.opensuse.org/viewcvs/yast?rev=54709&view=rev Log: - Initialize the target before loading it, evaluate the return values and report errors to user (bnc #466803). - 2.17.17 Modified: branches/SuSE-Code-11-Branch/update/VERSION branches/SuSE-Code-11-Branch/update/package/yast2-update.changes branches/SuSE-Code-11-Branch/update/src/include/rootpart.ycp Modified: branches/SuSE-Code-11-Branch/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/update/VERSION?rev=54709&r1=54708&r2=54709&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/update/VERSION (original) +++ branches/SuSE-Code-11-Branch/update/VERSION Fri Jan 16 15:54:20 2009 @@ -1 +1 @@ -2.17.16 +2.17.17 Modified: branches/SuSE-Code-11-Branch/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/update/package/yast2-update.changes?rev=54709&r1=54708&r2=54709&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/update/package/yast2-update.changes (original) +++ branches/SuSE-Code-11-Branch/update/package/yast2-update.changes Fri Jan 16 15:54:20 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 16 15:50:26 CET 2009 - locilka@suse.cz + +- Initialize the target before loading it, evaluate the return + values and report errors to user (bnc #466803). +- 2.17.17 + +------------------------------------------------------------------- Wed Dec 10 12:53:01 CET 2008 - aschnell@suse.de - show strange warning only once (bnc #457762) Modified: branches/SuSE-Code-11-Branch/update/src/include/rootpart.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/update/src/include/rootpart.ycp?rev=54709&r1=54708&r2=54709&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/update/src/include/rootpart.ycp (original) +++ branches/SuSE-Code-11-Branch/update/src/include/rootpart.ycp Fri Jan 16 15:54:20 2009 @@ -374,7 +374,40 @@ // New partition has been mounted if (flavor == `update_dialog && ret == `next) { - Pkg::TargetLoad(); + // Target load failed, #466803 + if (! Pkg::TargetInit (Installation::destdir, true /* dummy */) && Popup::AnyQuestion ( + Label::ErrorMsg(), + _("Initializing the system for upgrade has failed for unknown reason. +It is highly recommended not to continue the upgrade process. + +Are you sure you want to continue?"), + _("&Yes, Continue"), + Label::CancelButton(), + `focus_no + )) { + ret = `back; + } else { + y2warning ("User decided to continue despite the error above (Pkg::TargetInit() failed)"); + } + + // not aborted + if (ret != `back) { + // Target load failed, #466803 + if (! Pkg::TargetLoad() && Popup::AnyQuestion ( + Label::ErrorMsg(), + _("Initializing the system for upgrade has failed for unknown reason. +It is highly recommended not to continue the upgrade process. + +Are you sure you want to continue?"), + _("&Yes, Continue"), + Label::CancelButton(), + `focus_no + )) { + ret = `back; + } else { + y2warning ("User decided to continue despite the error above (Pkg::TargetLoad() failed)"); + } + } } return (symbol)ret; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org