![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package yast2 checked in at Wed Apr 19 15:53:10 CEST 2006. -------- --- yast2/yast2.changes 2006-04-18 15:47:07.000000000 +0200 +++ STABLE/yast2/yast2.changes 2006-04-19 15:09:54.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 19 15:02:44 CEST 2006 - jsuchome@suse.cz + +- menu.ycp: check for `restart_menu possible return value (#162966) +- scripts/yast2: enable restarting curses menu +- 2.13.51 + +------------------------------------------------------------------- Old: ---- yast2-2.13.50.tar.bz2 New: ---- yast2-2.13.51.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.2qT5X2/_old 2006-04-19 15:52:57.000000000 +0200 +++ /var/tmp/diff_new_pack.2qT5X2/_new 2006-04-19 15:52:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.13.50) +# spec file for package yast2 (Version 2.13.51) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2 -Version: 2.13.50 +Version: 2.13.51 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.13.50.tar.bz2 +Source0: yast2-2.13.51.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite # Need the new file popups @@ -93,7 +93,7 @@ Steffen Winterfeldt <snwint@suse.de> %prep -%setup -n yast2-2.13.50 +%setup -n yast2-2.13.51 %build %{prefix}/bin/y2tool y2autoconf @@ -192,6 +192,10 @@ %doc %{prefix}/share/doc/packages/yast2/wizard %changelog -n yast2 +* Wed Apr 19 2006 - jsuchome@suse.cz +- menu.ycp: check for `restart_menu possible return value (#162966) +- scripts/yast2: enable restarting curses menu +- 2.13.51 * Tue Apr 18 2006 - jsuchome@suse.cz - menu.ycp: better check if menu should exit after online-update - 2.13.50 ++++++ yast2-2.13.50.tar.bz2 -> yast2-2.13.51.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.50/VERSION new/yast2-2.13.51/VERSION --- old/yast2-2.13.50/VERSION 2006-04-18 15:14:00.000000000 +0200 +++ new/yast2-2.13.51/VERSION 2006-04-19 15:04:22.000000000 +0200 @@ -1 +1 @@ -2.13.50 +2.13.51 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.50/library/desktop/src/menu.ycp new/yast2-2.13.51/library/desktop/src/menu.ycp --- old/yast2-2.13.50/library/desktop/src/menu.ycp 2006-04-18 15:12:40.000000000 +0200 +++ new/yast2-2.13.51/library/desktop/src/menu.ycp 2006-04-19 14:42:02.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: NCurses Control Center * Authors: Michal Svec <msvec@suse.cz> * - * $Id: menu.ycp 25592 2005-09-23 10:33:25Z locilka $ + * $Id: menu.ycp 30181 2006-04-18 13:47:35Z jsuchome $ * * Provides a list of available yast2 modules. This module is inteded for use * with ncurses, for X the yast2 control center should be used. @@ -15,12 +15,16 @@ textdomain "base"; import "Desktop"; +import "Directory"; +import "FileUtils"; import "Label"; import "Popup"; map Groups = $[]; map Modules = $[]; +string restart_file = Directory::vardir + "/restart_menu"; + /** */ define void DisplaySplash() { @@ -87,9 +91,10 @@ any ret = WFM::CallFunction (function, arguments); y2debug("WFM::CallFunction (%1, %2) returns: %3", function, arguments, ret); - if (function == "online_update" && ret == -42) + if ((function == "online_update" && ret == -42) || ret == `restart_menu) { y2milestone ("yast needs to be restarted - exiting..."); + SCR::Execute (.target.bash, sformat ("touch %1", restart_file)); return true; } } @@ -177,6 +182,13 @@ y2debug("Groups=%1", Groups); y2debug("Modules=%1", Modules); +if (FileUtils::Exists (restart_file)) +{ + SCR::Execute (.target.remove, restart_file); +} + +UI::CloseDialog (); + OpenMenu(); list<term> GroupList = Desktop::GroupList(); @@ -186,7 +198,7 @@ /* precache groups (#38363) */ list<string> groups = maplist(term gr, GroupList, ``{ - return (string) select((term) select(gr, 0, `empty()), 0, nil); + return (string) gr[0,0]:nil; }); y2debug("groups=%1", groups); @@ -195,7 +207,7 @@ }); y2debug("modules=%1", modules); -string first = select(groups, 0, nil); +string first = groups[0]:nil; y2debug("first=%1", first); /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.50/library/modules/Version.ycp new/yast2-2.13.51/library/modules/Version.ycp --- old/yast2-2.13.50/library/modules/Version.ycp 2006-04-18 15:14:07.000000000 +0200 +++ new/yast2-2.13.51/library/modules/Version.ycp 2006-04-19 15:04:27.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.13.50"; +global string yast2 = "2.13.51"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.50/scripts/yast2 new/yast2-2.13.51/scripts/yast2 --- old/yast2-2.13.50/scripts/yast2 2006-04-14 14:37:47.000000000 +0200 +++ new/yast2-2.13.51/scripts/yast2 2006-04-19 14:49:35.000000000 +0200 @@ -161,7 +161,12 @@ # use menu.ycp # TODO: this does not need to be a special case. refactor after release if [ $module == "menu" ] ; then - $ybindir/y2base menu ncurses $NCTHREADS + while true ; do + $ybindir/y2base menu ncurses $NCTHREADS + if [ ! -e "/var/lib/YaST2/restart_menu" ] ; then + break + fi + done else while true ; do # Transform every argument into a ycp string, that is surround all ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...