Author: locilka Date: Mon Jan 19 17:18:41 2009 New Revision: 54772 URL: http://svn.opensuse.org/viewcvs/yast?rev=54772&view=rev Log: A better (really working) patch for the previous bug (partly fixed in 2.17.17) Modified: trunk/update/src/include/rootpart.ycp Modified: trunk/update/src/include/rootpart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/include/rootpart.ycp?rev=54772&r1=54771&r2=54772&view=diff ============================================================================== --- trunk/update/src/include/rootpart.ycp (original) +++ trunk/update/src/include/rootpart.ycp Mon Jan 19 17:18:41 2009 @@ -375,25 +375,9 @@ // New partition has been mounted if (flavor == `update_dialog && ret == `next) { // 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 ( + if (Pkg::TargetInitialize (Installation::destdir) != true) { + y2error ("Pkg::TargetInitialize failed"); + if (Popup::AnyQuestion ( Label::ErrorMsg(), _("Initializing the system for upgrade has failed for unknown reason. It is highly recommended not to continue the upgrade process. @@ -405,7 +389,29 @@ )) { ret = `back; } else { - y2warning ("User decided to continue despite the error above (Pkg::TargetLoad() failed)"); + y2warning ("User decided to continue despite the error above (Pkg::TargetInit() failed)"); + } + } + + // not aborted + if (ret != `back) { + // Target load failed, #466803 + if (Pkg::TargetLoad() != true) { + y2error ("Pkg::TargetLoad failed"); + if (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)"); + } } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org