Author: jsuchome Date: Mon Dec 8 15:55:57 2008 New Revision: 53974 URL: http://svn.opensuse.org/viewcvs/yast?rev=53974&view=rev Log: - do not return integer value to let YOU restart itself (bnc#457167) - 2.17.13 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/online_update.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=53974&r1=53973&r2=53974&view=diff ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Mon Dec 8 15:55:57 2008 @@ -1 +1 @@ -2.17.12 +2.17.13 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-online-update.changes?rev=53974&r1=53973&r2=53974&view=diff ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Mon Dec 8 15:55:57 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 8 15:34:46 CET 2008 - jsuchome@suse.cz + +- do not return integer value to let YOU restart itself (bnc#457167) +- 2.17.13 + +------------------------------------------------------------------- Mon Dec 8 15:24:11 CET 2008 - lslezak@suse.cz - Fixed the data type for solver flags (bnc#457233) Modified: trunk/online-update/src/online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/online_update.ycp?rev=53974&r1=53973&r2=53974&view=diff ============================================================================== --- trunk/online-update/src/online_update.ycp (original) +++ trunk/online-update/src/online_update.ycp Mon Dec 8 15:55:57 2008 @@ -25,9 +25,6 @@ import "Wizard"; import "GetInstArgs"; - // return value is integer - integer retval = 1; - /** * Main sequence for Online Update */ @@ -211,7 +208,6 @@ } } - retval = 0; if (OnlineUpdate::restart_yast) { if (FileUtils::Exists (Directory::vardir + "/selected_patches.ycp")) @@ -219,8 +215,6 @@ Popup::Message (OnlineUpdate::restart_message); } OnlineUpdate::restart_yast = false; - // restart menu.ycp even if there are no other patches selected - retval = -42; } if (OnlineUpdate::reboot_needed) { @@ -316,9 +310,10 @@ } arg_n = arg_n + 1; } + any ret = `next; if (OnlineUpdate::cd_update || OnlineUpdate::simple_mode) // obsolete .cd_default argument was used - OnlineUpdateSequence (); + ret = OnlineUpdateSequence (); else - CommandLine::Run (cmdline); - return retval; + ret = CommandLine::Run (cmdline); + return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org