Hello community, here is the log from the commit of package yast2-online-update checked in at Tue Mar 6 18:38:00 CET 2007. -------- --- yast2-online-update/yast2-online-update.changes 2007-03-01 14:54:39.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-online-update/yast2-online-update.changes 2007-03-06 15:50:15.792826000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 6 15:35:18 CET 2007 - jsuchome@suse.cz + +- show 'reboot now' popup also on installed system (#250606) +- 2.15.8 + +------------------------------------------------------------------- Old: ---- yast2-online-update-2.15.7.tar.bz2 New: ---- yast2-online-update-2.15.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.m25638/_old 2007-03-06 18:32:03.000000000 +0100 +++ /var/tmp/diff_new_pack.m25638/_new 2007-03-06 18:32:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-online-update (Version 2.15.7) +# spec file for package yast2-online-update (Version 2.15.8) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-online-update -Version: 2.15.7 +Version: 2.15.8 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-online-update-2.15.7.tar.bz2 +Source0: yast2-online-update-2.15.8.tar.bz2 prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager PreReq: grep sed @@ -48,7 +48,7 @@ gs@suse.de %prep -%setup -n yast2-online-update-2.15.7 +%setup -n yast2-online-update-2.15.8 %build %{prefix}/bin/y2tool y2autoconf @@ -143,6 +143,9 @@ %ghost %{prefix}/share/applications/YaST2/cd_update.desktop %changelog +* Tue Mar 06 2007 - jsuchome@suse.cz +- show 'reboot now' popup also on installed system (#250606) +- 2.15.8 * Thu Mar 01 2007 - jsuchome@suse.cz - added basic command line support (#249306) - removed obsoleted variables and files ++++++ yast2-online-update-2.15.7.tar.bz2 -> yast2-online-update-2.15.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.7/src/online_update_select.ycp new/yast2-online-update-2.15.8/src/online_update_select.ycp --- old/yast2-online-update-2.15.7/src/online_update_select.ycp 2007-02-15 10:05:52.000000000 +0100 +++ new/yast2-online-update-2.15.8/src/online_update_select.ycp 2007-03-06 15:31:47.000000000 +0100 @@ -90,9 +90,12 @@ boolean restart_yast = false; list<string> normal_patches = []; boolean more_patches_needed = false; + boolean reboot_needed = false; foreach (map patch, Pkg::ResolvableProperties("", `patch, ""), { if (patch["status"]:`none == `selected) { + if (patch["reboot_needed"]:false) + reboot_needed = true; if (patch["affects_pkg_manager"]:false) restart_yast = true; else @@ -113,6 +116,8 @@ Pkg::ResolvableNeutral (pname, `patch, true); }); SCR::Write (.target.ycp, saved_path, normal_patches); + // show reboot popup only when yast is not going to restart itself automatically + reboot_needed = false; } // no patch selected if (!restart_yast && normal_patches == [] && !Pkg::PkgAnyToInstall () && @@ -121,6 +126,7 @@ ret = `cancel; } OnlineUpdate::restart_yast = restart_yast; + OnlineUpdate::reboot_needed = reboot_needed; if ( ret == `cancel ) return `abort; else return `next; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.7/src/online_update.ycp new/yast2-online-update-2.15.8/src/online_update.ycp --- old/yast2-online-update-2.15.7/src/online_update.ycp 2007-03-01 14:10:01.000000000 +0100 +++ new/yast2-online-update-2.15.8/src/online_update.ycp 2007-03-06 15:34:24.000000000 +0100 @@ -34,7 +34,7 @@ Wizard::CreateDialog(); Wizard::SetDesktopIcon("online_update"); // help text for online-update initialization - Wizard::RestoreHelp ("<p>The system is initializing the installation and update sources. Installation and update sources can be altered in the <b>Installation Source</b> module.</p>"); + Wizard::RestoreHelp (_("<p>The system is initializing the installation and update sources. Installation and update sources can be altered in the <b>Installation Source</b> module.</p>")); list<string> stages = [ // progress stage label @@ -141,6 +141,10 @@ OnlineUpdate::restart_yast = false; retval = -42;// restart menu.ycp even if there are no other patches selected } + else if (OnlineUpdate::reboot_needed) + { + Popup::Message (OnlineUpdate::reboot_message); + } return `next; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.7/src/OnlineUpdate.ycp new/yast2-online-update-2.15.8/src/OnlineUpdate.ycp --- old/yast2-online-update-2.15.7/src/OnlineUpdate.ycp 2007-03-01 14:07:07.000000000 +0100 +++ new/yast2-online-update-2.15.8/src/OnlineUpdate.ycp 2007-03-06 15:31:47.000000000 +0100 @@ -25,5 +25,12 @@ global string restart_message =_("Packages for package management were updated. Finishing and restarting now."); +// if patch with reboot flag was installed +global boolean reboot_needed = false; + +// popup message +global string reboot_message = _("At least one of the updates installed requires a system reboot to function +properly. Reboot the system."); + /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.7/VERSION new/yast2-online-update-2.15.8/VERSION --- old/yast2-online-update-2.15.7/VERSION 2007-03-01 14:08:51.000000000 +0100 +++ new/yast2-online-update-2.15.8/VERSION 2007-03-06 15:35:33.000000000 +0100 @@ -1 +1 @@ -2.15.7 +2.15.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org