Author: jkupec
Date: Fri Sep 14 17:06:32 2007
New Revision: 7249
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7249&view=rev
Log:
- don't warn about reboot or restart if the action has been cancelled
(#257520)
Modified:
trunk/zypper/src/zypper-misc.cc
Modified: trunk/zypper/src/zypper-misc.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=7249&r1=7248&r2=7249&view=diff
==============================================================================
--- trunk/zypper/src/zypper-misc.cc (original)
+++ trunk/zypper/src/zypper-misc.cc Fri Sep 14 17:06:32 2007
@@ -1371,7 +1371,7 @@
// returns -1, 0, ZYPPER_EXIT_INF_REBOOT_NEEDED, or ZYPPER_EXIT_INF_RESTART_NEEDED
int retv = show_summary();
-
+ bool was_installed = false;
if (retv >= 0) { // there are resolvables to install/uninstall
if (read_bool_answer(_("Continue?"), true)) {
@@ -1385,6 +1385,7 @@
// FIXME do resync if in shell mode, how do I know if in shell mode?
ZYppCommitResult result = God->commit( ZYppCommitPolicy().syncPoolAfterCommit(false) );
+ was_installed = true;
gData.show_media_progress_hack = false;
@@ -1427,21 +1428,24 @@
if (retv < 0)
retv = ZYPPER_EXIT_OK;
- else if (retv == ZYPPER_EXIT_INF_REBOOT_NEEDED)
+ else if (was_installed)
{
- if (gSettings.machine_readable)
- cout << "