Mailinglist Archive: yast-commit (553 mails)

[jsuchome@xxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Wed Dec 16 13:56:01 2009
New Revision: 60117

URL: http://svn.opensuse.org/viewcvs/yast?rev=60117&view=rev
Log:
- better message for telling user to reboot, show list of patches
  that require a reboot (bnc#497217)
- 2.17.20


Modified:
    branches/SuSE-Code-11-SP1-Branch/online-update/VERSION
    
branches/SuSE-Code-11-SP1-Branch/online-update/package/yast2-online-update.changes
    branches/SuSE-Code-11-SP1-Branch/online-update/src/OnlineUpdate.ycp
    branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update.ycp
    branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update_select.ycp

Modified: branches/SuSE-Code-11-SP1-Branch/online-update/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/online-update/VERSION?rev=60117&r1=60116&r2=60117&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/online-update/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/online-update/VERSION Wed Dec 16 13:56:01 
2009
@@ -1 +1 @@
-2.17.19
+2.17.20

Modified: 
branches/SuSE-Code-11-SP1-Branch/online-update/package/yast2-online-update.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/online-update/package/yast2-online-update.changes?rev=60117&r1=60116&r2=60117&view=diff
==============================================================================
--- 
branches/SuSE-Code-11-SP1-Branch/online-update/package/yast2-online-update.changes
 (original)
+++ 
branches/SuSE-Code-11-SP1-Branch/online-update/package/yast2-online-update.changes
 Wed Dec 16 13:56:01 2009
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed Dec 16 13:24:49 CET 2009 - jsuchome@xxxxxxx
+
+- better message for telling user to reboot, show list of patches
+  that require a reboot (bnc#497217)
+- 2.17.20
+
+-------------------------------------------------------------------
 Tue Feb 17 16:25:04 CET 2009 - jsuchome@xxxxxxx
 
 - AutoYaST: call solver before preselecting patches (bnc#476460)

Modified: branches/SuSE-Code-11-SP1-Branch/online-update/src/OnlineUpdate.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/online-update/src/OnlineUpdate.ycp?rev=60117&r1=60116&r2=60117&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/online-update/src/OnlineUpdate.ycp 
(original)
+++ branches/SuSE-Code-11-SP1-Branch/online-update/src/OnlineUpdate.ycp Wed Dec 
16 13:56:01 2009
@@ -35,9 +35,19 @@
 // if patch with reboot flag was installed
 global boolean reboot_needed   = false;
 
+// packages that are requiring reboot
+global list<string> reboot_packages    = [];
+
 // popup message
 global string reboot_message   = _("At least one of the updates installed 
requires a system reboot to function
-properly. Reboot the system.");
+properly. Reboot the system as soon as possible.");
+
+// popup message
+global string reboot_message_list      = _("These updates require a system 
reboot to function properly:
+
+%1.
+
+Reboot the system as soon as possible.");
 
 // continue/cancel popup text
 global string more_selected_message    = _("There are patches for package 
management available that require a restart of YaST.

Modified: branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update.ycp?rev=60117&r1=60116&r2=60117&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update.ycp 
(original)
+++ branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update.ycp Wed 
Dec 16 13:56:01 2009
@@ -218,7 +218,10 @@
   }
   if (OnlineUpdate::reboot_needed)
   {
-    Popup::Message (OnlineUpdate::reboot_message);
+    if (size (OnlineUpdate::reboot_packages) > 0)
+       Popup::Message (sformat (OnlineUpdate::reboot_message_list, mergestring 
(OnlineUpdate::reboot_packages, "\n")));
+    else
+       Popup::Message (OnlineUpdate::reboot_message);
   }
   else if (OnlineUpdate::relogin_needed)
   {

Modified: 
branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update_select.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update_select.ycp?rev=60117&r1=60116&r2=60117&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update_select.ycp 
(original)
+++ branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update_select.ycp 
Wed Dec 16 13:56:01 2009
@@ -54,6 +54,7 @@
   boolean normal_patches_selected      = false;
   integer selected     = 0;
   string saved_path    = Directory::vardir + "/selected_patches.ycp";
+  list<string> reboot_packages = [];
 
   // check if YaST was restarted
   if (FileUtils::Exists (saved_path))
@@ -197,7 +198,11 @@
     {
        y2milestone ("selected patch: %1", patch);
        if (patch["reboot_needed"]:false)
+       {
            reboot_needed       = true;
+           reboot_packages     = (list<string>) union (
+               reboot_packages, [ patch["name"]:"" ]);
+       }
        if (patch["relogin_needed"]:false)
            relogin_needed      = true;
        if (patch["affects_pkg_manager"]:false)
@@ -238,6 +243,7 @@
   }
   OnlineUpdate::restart_yast   = restart_yast;
   OnlineUpdate::reboot_needed  = reboot_needed;
+  OnlineUpdate::reboot_packages        = reboot_packages;
   OnlineUpdate::relogin_needed = relogin_needed;
 
   if ( ret == `cancel ) return `abort;

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx