April 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r68034 - /tags/branch-Code-11-SP2-2_17_5/lxc/
by jsuchome＠svn2.opensuse.org 27 Apr '12

27 Apr '12

Author: jsuchome Date: Fri Apr 27 13:34:00 2012 New Revision: 68034 URL: http://svn.opensuse.org/viewcvs/yast?rev=68034&view=rev Log: Created tag branch-Code-11-SP2-2_17_5 for lxc Added: tags/branch-Code-11-SP2-2_17_5/lxc/ - copied from r68033, branches/SuSE-Code-11-SP2-Branch/lxc/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68033 - in /branches/SuSE-Code-11-SP2-Branch/lxc: VERSION package/yast2-lxc.changes src/Lxc.ycp src/dialogs.ycp src/helps.ycp
by jsuchome＠svn2.opensuse.org 27 Apr '12

27 Apr '12

Author: jsuchome Date: Fri Apr 27 13:33:33 2012 New Revision: 68033 URL: http://svn.opensuse.org/viewcvs/yast?rev=68033&view=rev Log: - updated help texts - try to higlight lxc-checkconfig output in ncurses - 2.17.5 Modified: branches/SuSE-Code-11-SP2-Branch/lxc/VERSION branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/V… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/VERSION Fri Apr 27 13:33:33 2012 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/p… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes Fri Apr 27 13:33:33 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 27 13:21:01 CEST 2012 - jsuchome(a)suse.cz + +- updated help texts +- try to higlight lxc-checkconfig output in ncurses +- 2.17.5 + +------------------------------------------------------------------- Thu Apr 26 16:06:25 CEST 2012 - jsuchome(a)suse.cz - check if configuration is prepared Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp Fri Apr 27 13:33:33 2012 @@ -124,7 +124,8 @@ "cp /proc/config.gz %1/ && gunzip %1/config.gz", tmpdir)); map out = (map) SCR::Execute (.target.bash_output, sformat ( - "GREP=grep CONFIG=%1/config /usr/bin/lxc-checkconfig", tmpdir)); +// "GREP=grep CONFIG=%1/config /usr/bin/lxc-checkconfig", tmpdir)); + "GREP=grep /usr/bin/lxc-checkconfig")); list<string> rt = []; map<string,string> colors = $[ @@ -142,11 +143,21 @@ integer found = find (line, color); if (found != nil && found > 0) { - line = sformat ("%1%3", + if (textmode) + { + line = sformat ("%1%2", + substring (line, 0, found), + substring (line, found + size (color)) + ); + } + else + { + line = sformat ("%1%3", substring (line, 0, found), name, substring (line, found + size (color)) - ); + ); + } colored = true; if (name == "red" || name == "yellow") problem = true; @@ -218,6 +229,8 @@ Progress::NextStage(); + textmode = UI::GetDisplayInfo()["TextMode"]:false; + CheckLXCConfiguration (); Progress::NextStage(); @@ -231,8 +244,6 @@ map security = Security::Export (); method = tolower (security["PASSWD_ENCRYPTION"]:"des"); - textmode = UI::GetDisplayInfo()["TextMode"]:false; - Progress::NextStage(); return true; Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Fri Apr 27 13:33:33 2012 @@ -123,7 +123,7 @@ `HSpacing (0.5), `VBox ( `HBox ( // text entry label - `TextEntry (`id (`ip), _("IP Address")), + `TextEntry (`id (`ip), _("IP Address"), "0.0.0.0"), `HSpacing (), // text entry label `TextEntry (`id (`subnet), _("Subnet"), "/24"), Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp Fri Apr 27 13:33:33 2012 @@ -55,9 +55,15 @@ "create" : _("<big>Creating New Container</big>") + // Create dialog help, part 2 -_("Choose a Name, Template and enter network settings for the new container. If there's no bridge device configured yet, use Configure Network button and create one. Select a root password to use in the container.") + +_("Choose a Name, Template and enter network settings for the new container.") + // Create dialog help, part 3 +_("Use the value <tt>0.0.0.0</tt> as IP Address to have dynamic address assigned by DHCP. If there's no bridge device configured yet, use Configure Network button and create one.") + + + // Create dialog help, part 4 +_("Select a root password to use in the container. If no password is entered, the default value <tt>root</tt> will be used.") + + + // Create dialog help, part 5 _("Use Create to start the creation process.") -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68032 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes yast2-qt-pkg.spec.in
by tgoettlicher＠svn2.opensuse.org 27 Apr '12

27 Apr '12

Author: tgoettlicher Date: Fri Apr 27 10:55:14 2012 New Revision: 68032 URL: http://svn.opensuse.org/viewcvs/yast?rev=68032&view=rev Log: gcc47 fix Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/yast2-qt-pkg.spec.in Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=68032&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Fri Apr 27 10:55:14 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "23") +SET(VERSION_PATCH "24") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Fri Apr 27 10:55:14 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 27 10:54:25 CEST 2012 - tgoettlicher(a)suse.de + +- Workaround for gcc 4.7 issues +- 2.21.24 + +------------------------------------------------------------------- Thu Apr 26 11:03:07 CEST 2012 - tgoettlicher(a)suse.de - Added package group for unneeded packages Modified: trunk/qt-pkg/yast2-qt-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/yast2-qt-pkg.spec.in?rev=… ============================================================================== --- trunk/qt-pkg/yast2-qt-pkg.spec.in (original) +++ trunk/qt-pkg/yast2-qt-pkg.spec.in Fri Apr 27 10:55:14 2012 @@ -14,6 +14,12 @@ BuildRequires: yast2-qt-devel >= 2.20.0 BuildRequires: libzypp-devel >= 11.4.0 BuildRequires: yast2-libyui-devel >= 2.20.0 +%if 0%{?force_gcc_46} +BuildRequires: gcc46 +BuildRequires: gcc46-c++ +%else +BuildRequires: gcc-c++ >= 4.6 +%endif Requires: libzypp >= 11.4.0 Requires: yast2-libyui >= 2.20.0 Requires: yast2_theme >= 2.16.1 @@ -31,6 +37,10 @@ %build mkdir build cd build +%if 0%{?force_gcc_46} +export CC=gcc-4.6 +export CXX=g++-4.6 +%endif export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$CFLAGS" cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68031 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src: IscsiLioData.ycp IscsiServerFunctions.pm dialogs.ycp widgets.ycp
by fehr＠svn2.opensuse.org 26 Apr '12

26 Apr '12

Author: fehr Date: Thu Apr 26 17:55:42 2012 New Revision: 68031 URL: http://svn.opensuse.org/viewcvs/yast?rev=68031&view=rev Log: checkin for backup purposes Removed: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiServerFunctions.pm Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp Thu Apr 26 17:55:42 2012 @@ -250,7 +250,7 @@ global void SetIetdAuth( string tgt, integer tpg, list<string> incom, string outgo ) { map<string,any> m = GetTgt(data,tgt,tpg); - foreach( string s, incom, ``{m=AddIncoming( m, s );}); + foreach( string s, incom, {m=AddIncoming( m, s );}); if( !isempty(outgo) ) m = AddOutgoing( m, outgo ); SetTgt(data,tgt,tpg,m); Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp Thu Apr 26 17:55:42 2012 @@ -223,13 +223,6 @@ "services" : [ "service:iscsitarget" ], "display_details" : true, ]), - "save" : $[ - "widget" : `push_button, - "label" : Label::SaveButton(), - "handle" : saveConfiguration, - "opt": [], - "help": HELPS["save_configuration"]:"" - ], "isns" : $[ "widget" : `custom, "custom_widget" : Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp Thu Apr 26 17:55:42 2012 @@ -24,7 +24,6 @@ { textdomain "iscsi-lio-server"; -import "IscsiServerFunctions"; import "IscsiLioData"; import "Label"; import "Event"; @@ -638,30 +637,6 @@ } -symbol saveConfiguration(string key, map event) - { - y2milestone( "saveConfiguration key:%1 event:%2", key, event ); - if( is(event["ID"]:nil, string) && event["ID"]:"" == "save") - { - any filename = UI::AskForSaveFileName("/", "*", _("Save as...")); - if ( filename != nil && (string)filename!="") - { - if( IscsiServerFunctions::SaveIntoFile( (string)filename )) - { - Popup::Message(sformat(_("File %1 was saved successfully."), filename)); - list pathComponents = splitstring( (string)filename, "/"); - integer s = size(pathComponents) - 1; - string base = pathComponents[s]:"default"; - } - else - { - Popup::Warning(_("An error occurred while saving the file.")); - } - } - } - return nil; - } - list<term> RemoveById( list<term> it, any id ) { y2milestone( "RemoveById id:%1 item:%2", id, filter( term i, it, ``(i[0,0]:(any)99==id)) ); @@ -679,7 +654,7 @@ // dialog with targets // initialize target dialog -void initTable (string key) ``{ +void initTable (string key) { integer count = 0; list <term> inc_items = []; // create items from targets @@ -750,13 +725,9 @@ return ret; } -void initiSNS (string key) ``{ +void initiSNS (string key) { boolean ac=false; string ip = ""; -foreach(map<string, any> row, IscsiServerFunctions::getConfig()["iSNS"]:[], { - if(row["KEY"]:""=="iSNSAccessControl") ac=(row["VALUE"]:"No"=="Yes") ? true : false; - if(row["KEY"]:""=="iSNSServer") ip=row["VALUE"]:""; -}); UI::ChangeWidget(`isns_ac, `Value, ac); UI::ChangeWidget(`isns_ip, `Value, ip); } @@ -778,7 +749,6 @@ } string ac=((boolean)UI::QueryWidget(`isns_ac, `Value))?"Yes":"No"; if (ip=="") ac=""; - IscsiServerFunctions::setiSNS(ip, ac); } // **************** Edit Dialog ***************************** @@ -1242,7 +1212,7 @@ boolean chg = false; list<string> cl = IscsiLioData::GetClntList( curr_target, curr_tpg ); foreach( string c, del_clnt, - ``{ + { if( contains( cl, c )) { chg = true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68030 - in /branches/SuSE-Code-11-SP2-Branch/lxc: VERSION package/yast2-lxc.changes src/Makefile.am src/dialogs.ycp src/helps.ycp src/wizards.ycp
by jsuchome＠svn2.opensuse.org 26 Apr '12

26 Apr '12

Author: jsuchome Date: Thu Apr 26 16:24:02 2012 New Revision: 68030 URL: http://svn.opensuse.org/viewcvs/yast?rev=68030&view=rev Log: - check if configuration is prepared - updated help texts - 2.17.4 Added: branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp (with props) Modified: branches/SuSE-Code-11-SP2-Branch/lxc/VERSION branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/V… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/VERSION Thu Apr 26 16:24:02 2012 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/p… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes Thu Apr 26 16:24:02 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 26 16:06:25 CEST 2012 - jsuchome(a)suse.cz + +- check if configuration is prepared +- updated help texts +- 2.17.4 + +------------------------------------------------------------------- Mon Apr 23 16:42:59 CEST 2012 - jsuchome(a)suse.cz - handle more consoles running Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am Thu Apr 26 16:24:02 2012 @@ -6,6 +6,7 @@ lxc.ycp ynclude_DATA = \ + helps.ycp \ wizards.ycp \ dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Thu Apr 26 16:24:02 2012 @@ -40,6 +40,8 @@ import "Security"; import "Wizard"; +include "lxc/helps.ycp"; + // PIDs of running consoles (indexed by lxc names) map<string,integer> console_pids = $[]; @@ -156,9 +158,7 @@ `VSpacing () ), `HSpacing ()); - string help_text = ""; - - Wizard::SetContentsButtons(caption, contents, help_text, + Wizard::SetContentsButtons(caption, contents, HELPS["create"]:"", // button label Label::CancelButton(), _("Create")); @@ -464,7 +464,7 @@ `VSpacing () ), `HSpacing ()); - Wizard::SetContentsButtons(caption, contents, "overview", + Wizard::SetContentsButtons(caption, contents, HELPS["overview"]:"", Label::BackButton(), Label::FinishButton()); update_table (); Added: branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp Thu Apr 26 16:24:02 2012 @@ -0,0 +1,67 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/lxc/helps.ycp + * Package: Configuration of lxc + * Summary: Help texts of all the dialogs + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +{ + +textdomain "lxc"; + +/** + * All helps are here + */ +map HELPS = $[ + + /* Read dialog help */ + "read" : _("<big>Initializing LXC Configuration</big> +Please wait... +"), + + // Overview dialog help, part 1 + "overview" : _("<big>LXC Overview</big> +Here, see the list of configured Linux Containers (LXC) with their current status. +Use Create to create new container. Delete existing one with Destroy. +") + + + // Overview dialog help, part 2 +_("You can start selected container with Start. The container is started in background. You can connect to it using Connect button or manually using <tt>lxc-console</tt> command. Once in console, you can close it from within or using the Disconnect button. +Note that Connect option is not available in text mode."), + + // Create dialog help, part 1 + "create" : _("<big>Creating New Container</big>") + + + // Create dialog help, part 2 +_("Choose a Name, Template and enter network settings for the new container. If there's no bridge device configured yet, use Configure Network button and create one. Select a root password to use in the container.") + + + // Create dialog help, part 3 +_("Use Create to start the creation process.") + + +]; + +/* EOF */ +} Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp Thu Apr 26 16:24:02 2012 @@ -43,6 +43,7 @@ * @return `abort if aborted and `next otherwise */ symbol ReadDialog() { + Wizard::RestoreHelp(HELPS["read"]:""); if (!Confirm::MustBeRoot()) return `abort; boolean ret = Lxc::Read(); return ret ? `next : `abort; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68029 - /branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp
by jsuchome＠svn2.opensuse.org 26 Apr '12

26 Apr '12

Author: jsuchome Date: Thu Apr 26 15:10:36 2012 New Revision: 68029 URL: http://svn.opensuse.org/viewcvs/yast?rev=68029&view=rev Log: call lxc-checkconfig and show its result if errors were found Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp Thu Apr 26 15:10:36 2012 @@ -35,6 +35,7 @@ module "Lxc"; textdomain "lxc"; +import "Directory"; import "Progress"; import "Security"; @@ -112,6 +113,81 @@ } /** + * Check if LXC is correctly configured + */ +boolean CheckLXCConfiguration () { + + boolean problem = false; + // zgrep does not seem to work with .target.bash_output -> grep uncompressed config FIXME + string tmpdir = Directory::tmpdir; + SCR::Execute (.target.bash_output, sformat ( + "cp /proc/config.gz %1/ && gunzip %1/config.gz", tmpdir)); + + map out = (map) SCR::Execute (.target.bash_output, sformat ( + "GREP=grep CONFIG=%1/config /usr/bin/lxc-checkconfig", tmpdir)); + + list<string> rt = []; + map<string,string> colors = $[ + "blue" : "\033[1;32m", + "red" : "\033[1;31m", + "yellow" : "\033[1;33m" + ]; + foreach (string line, splitstring (out["stdout"]:"", "\n"), { + boolean colored = false; + foreach (string name, string color, colors, { + if (colored) + { + break; + } + integer found = find (line, color); + if (found != nil && found > 0) + { + line = sformat ("%1%3", + substring (line, 0, found), + name, + substring (line, found + size (color)) + ); + colored = true; + if (name == "red" || name == "yellow") + problem = true; + } + }); + // 'normalizing' color + integer found = find (line, "\033[0;39m"); + if (found != nil && found >= 0) + { + line = substring (line, 0, found) + + substring (line, found + size ( "\033[0;39m")); + } + rt = add (rt, line); + }); + + if (!problem) + { + return true; + } + + UI::OpenDialog (`opt(`decorated), `HBox(`HSpacing(1.5), + `VSpacing (30), + `VBox ( + `HSpacing(85), + `VSpacing(0.5), + // info label (try to keep the text short) + `Label (_("Some problems with LXC configuration were found. Check the documentation for details.")), + `VSpacing(0.5), + // output follows in widget below + `Left (`Label (_("Output of 'lxc-checkconfig' script:"))), + `RichText (`id (`rt), mergestring (rt, " ")), + `PushButton ("OK") + ))); + + UI::UserInput (); + UI::CloseDialog (); + + return false; +} + +/** * Read all lxc settings * @return true on success */ @@ -142,7 +218,7 @@ Progress::NextStage(); - // FIXME run lxc-checkconfig at start + CheckLXCConfiguration (); Progress::NextStage(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68028 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPkgPackageKitGroupsFilterView.cc src/YQPkgPackageKitGroupsFilterView.h yast2-qt-pkg.spec.in
by tgoettlicher＠svn2.opensuse.org 26 Apr '12

26 Apr '12

Author: tgoettlicher Date: Thu Apr 26 11:03:52 2012 New Revision: 68028 URL: http://svn.opensuse.org/viewcvs/yast?rev=68028&view=rev Log: Added package group for unneeded packages Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h trunk/qt-pkg/yast2-qt-pkg.spec.in Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=68028&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Thu Apr 26 11:03:52 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "22") +SET(VERSION_PATCH "23") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Apr 26 11:03:52 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 26 11:03:07 CEST 2012 - tgoettlicher(a)suse.de + +- Added package group for unneeded packages +- 2.21.23 + +------------------------------------------------------------------- Fri Mar 23 11:05:38 CET 2012 - tgoettlicher(a)suse.de - Fixed bnc#704123: When updating packages, same version numbers in different repositories confuse YaST Modified: trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPackageKitGroups… ============================================================================== --- trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc Thu Apr 26 11:03:52 2012 @@ -93,6 +93,7 @@ case YPKG_GROUP_SUGGESTED: return _( "Suggested Packages" ); case YPKG_GROUP_RECOMMENDED: return _( "Recommended Packages"); case YPKG_GROUP_ORPHANED: return _( "Orphaned Packages" ); + case YPKG_GROUP_UNNEEDED: return _( "Unneeded Packages" ); case YPKG_GROUP_MULTIVERSION: return _( "Multiversion Packages" ); // Intentionally omitting 'default' case so gcc can catch unhandled enums @@ -140,6 +141,7 @@ case YPKG_GROUP_SUGGESTED: return( "package_edutainment_languages" ); case YPKG_GROUP_RECOMMENDED: return( "package_edutainment_languages" ); case YPKG_GROUP_ORPHANED: return( "package_edutainment_languages" ); + case YPKG_GROUP_UNNEEDED: return( "package_edutainment_languages" ); case YPKG_GROUP_MULTIVERSION: return( "package_edutainment_languages" ); case YPKG_GROUP_ALL: return( "package_main" ); @@ -242,6 +244,7 @@ _groupsMap[ YPKG_GROUP_RECOMMENDED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_RECOMMENDED ); _groupsMap[ YPKG_GROUP_SUGGESTED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_SUGGESTED ); _groupsMap[ YPKG_GROUP_ORPHANED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_ORPHANED ); + _groupsMap[ YPKG_GROUP_UNNEDED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_UNNEEDED ); if ( ! zypp::sat::Pool::instance().multiversionEmpty() ) _groupsMap[ YPKG_GROUP_MULTIVERSION] = new YQPkgPackageKitGroup( this, YPKG_GROUP_MULTIVERSION ); @@ -320,7 +323,8 @@ // to solve first if ( _selectedGroup == YPKG_GROUP_SUGGESTED || _selectedGroup == YPKG_GROUP_RECOMMENDED || - _selectedGroup == YPKG_GROUP_ORPHANED ) + _selectedGroup == YPKG_GROUP_ORPHANED || + _selectedGroup == YPKG_GROUP_UNNEEDED ) { // set the busy cursor for the solving QApplication::setOverrideCursor(Qt::WaitCursor); @@ -377,6 +381,13 @@ emit filterMatch( selectable, pkg ); return true; } + if ( selectedGroup() == YPKG_GROUP_UNNEEDED && + zypp::PoolItem(pkg).status().isUnneeded() ) + { + emit filterMatch( selectable, pkg ); + return true; + } + if ( selectedGroup() == YPKG_GROUP_MULTIVERSION && selectable->multiversionInstall() ) { Modified: trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPackageKitGroups… ============================================================================== --- trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h (original) +++ trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h Thu Apr 26 11:03:52 2012 @@ -92,6 +92,7 @@ YPKG_GROUP_SUGGESTED, YPKG_GROUP_RECOMMENDED, YPKG_GROUP_ORPHANED, + YPKG_GROUP_UNNEEDED, YPKG_GROUP_MULTIVERSION, YPKG_GROUP_ALL, } YPkgGroupEnum; Modified: trunk/qt-pkg/yast2-qt-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/yast2-qt-pkg.spec.in?rev=… ============================================================================== --- trunk/qt-pkg/yast2-qt-pkg.spec.in (original) +++ trunk/qt-pkg/yast2-qt-pkg.spec.in Thu Apr 26 11:03:52 2012 @@ -12,9 +12,9 @@ Requires: yast2-qt >= 2.20.0 %requires_ge libqt4 BuildRequires: yast2-qt-devel >= 2.20.0 -BuildRequires: libzypp-devel >= 7.4.0 +BuildRequires: libzypp-devel >= 11.4.0 BuildRequires: yast2-libyui-devel >= 2.20.0 -Requires: libzypp >= 7.4.0 +Requires: libzypp >= 11.4.0 Requires: yast2-libyui >= 2.20.0 Requires: yast2_theme >= 2.16.1 Provides: yast2-qt:/usr/lib/YaST2/plugin/libpy2qt_pkg.so.2 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68027 - /tags/stable-2_22_1/sound/
by lslezak＠svn2.opensuse.org 26 Apr '12

26 Apr '12

Author: lslezak Date: Thu Apr 26 10:48:55 2012 New Revision: 68027 URL: http://svn.opensuse.org/viewcvs/yast?rev=68027&view=rev Log: Created tag stable-2_22_1 for sound Added: tags/stable-2_22_1/sound/ (props changed) - copied from r68026, trunk/sound/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68026 - in /trunk/sound: VERSION package/yast2-sound.changes
by lslezak＠svn2.opensuse.org 26 Apr '12

26 Apr '12

Author: lslezak Date: Thu Apr 26 10:30:20 2012 New Revision: 68026 URL: http://svn.opensuse.org/viewcvs/yast?rev=68026&view=rev Log: - 2.22.1 Modified: trunk/sound/VERSION trunk/sound/package/yast2-sound.changes Modified: trunk/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/VERSION?rev=68026&r1=68025… ============================================================================== --- trunk/sound/VERSION (original) +++ trunk/sound/VERSION Thu Apr 26 10:30:20 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Thu Apr 26 10:30:20 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Apr 26 08:28:45 UTC 2012 - lslezak(a)suse.cz + +- 2.22.1 + +------------------------------------------------------------------- Wed Apr 25 10:55:40 UTC 2012 - lslezak(a)suse.cz - path to asound.state has been changed (now stored in /var/lib/alsa -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68025 - in /trunk/ncurses-pkg/src: NCPkgFilterClassification.h NCPkgFilterLocale.h NCPkgFilterRepo.h
by gs＠svn2.opensuse.org 25 Apr '12

25 Apr '12

Author: gs Date: Wed Apr 25 14:29:50 2012 New Revision: 68025 URL: http://svn.opensuse.org/viewcvs/yast?rev=68025&view=rev Log: correct file names Modified: trunk/ncurses-pkg/src/NCPkgFilterClassification.h trunk/ncurses-pkg/src/NCPkgFilterLocale.h trunk/ncurses-pkg/src/NCPkgFilterRepo.h Modified: trunk/ncurses-pkg/src/NCPkgFilterClassification.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterClass… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterClassification.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterClassification.h Wed Apr 25 14:29:50 2012 @@ -33,9 +33,9 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: NCPkgPopupRepo.h + File: NCPkgFilterClassification.h - Author: Bubli <kmachalkova(a)suse.cz> + Author: Gabriele Mohr <gs(a)suse.com> /-*/ Modified: trunk/ncurses-pkg/src/NCPkgFilterLocale.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterLocal… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterLocale.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterLocale.h Wed Apr 25 14:29:50 2012 @@ -33,7 +33,7 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: NCPkgPopupRepo.h + File: NCPkgFilterLocale.h Author: Bubli <kmachalkova(a)suse.cz> Modified: trunk/ncurses-pkg/src/NCPkgFilterRepo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterRepo.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterRepo.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterRepo.h Wed Apr 25 14:29:50 2012 @@ -33,14 +33,14 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: NCPkgPopupRepo.h + File: NCPkgFilterRepo.h Author: Bubli <kmachalkova(a)suse.cz> /-*/ -#ifndef NCPkgPopupRepo_h -#define NCPkgPopupRepo_h +#ifndef NCPkgFilterRepo_h +#define NCPkgFilterRepo_h #include <iosfwd> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0