Author: lslezak Date: Fri Nov 20 15:02:45 2009 New Revision: 59670 URL: http://svn.opensuse.org/viewcvs/yast?rev=59670&view=rev Log: - sw_single - don't restart when started from command line (using "yast2 -i" option) and PKGMGR_ACTION_AT_EXIT="restart" (bnc#547609) - 2.19.0 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/sw_single.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=59670&r1=59669&r2=59670&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Nov 20 15:02:45 2009 @@ -1 +1 @@ -2.18.13 +2.19.0 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=59670&r1=59669&r2=59670&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Nov 20 15:02:45 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Nov 20 14:38:37 CET 2009 - lslezak@suse.cz + +- sw_single - don't restart when started from command line (using + "yast2 -i" option) and PKGMGR_ACTION_AT_EXIT="restart" + (bnc#547609) +- 2.19.0 + +------------------------------------------------------------------- Mon Oct 19 16:30:53 CEST 2009 - lslezak@suse.cz - Don't fail silently when an invallid repo URL is entered Modified: trunk/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/sw_single.ycp?rev=59670&r1=59669&r2=59670&view=diff ============================================================================== --- trunk/packager/src/clients/sw_single.ycp (original) +++ trunk/packager/src/clients/sw_single.ycp Fri Nov 20 15:02:45 2009 @@ -617,12 +617,12 @@ if (PKGMGR_ACTION_AT_EXIT == "summary" || size(commit_result[1]:[]) > 0) { - if (PackagesUI::ShowInstallationSummary() == `back) + if (PackagesUI::ShowInstallationSummary() == `back && size(packagelist) == 0) { force_restart = true; } } - else if (PKGMGR_ACTION_AT_EXIT == "restart") + else if (PKGMGR_ACTION_AT_EXIT == "restart" && size(packagelist) == 0) { force_restart = true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org