November 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <rest-service> master : optionally restart collectd if time is moved (bnc#557929) release 0.0.11
by Josef Reidinger 24 Nov '09

24 Nov '09

ref: refs/heads/master commit f1855c2a8379bfab1eb9957fe58228f515d4987c Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Nov 24 16:50:18 2009 +0100 optionally restart collectd if time is moved (bnc#557929) release 0.0.11 --- plugins/time/app/models/systemtime.rb | 12 ++++++ plugins/time/package/yast2-webservice-time.changes | 7 ++++ plugins/time/package/yast2-webservice-time.spec | 2 +- plugins/time/test/unit/systemtime_test.rb | 36 ++++++++++++++------ 4 files changed, 45 insertions(+), 12 deletions(-) diff --git a/plugins/time/app/models/systemtime.rb b/plugins/time/app/models/systemtime.rb index 946cc9d..dd773c4 100644 --- a/plugins/time/app/models/systemtime.rb +++ b/plugins/time/app/models/systemtime.rb @@ -100,6 +100,18 @@ class Systemtime #XXX hack to avoid dbus timeout durign moving time to future #FIXME use correct exception end + #restart collectd as moving in time confuse status module (bnc#557929) + begin + ret = YastService.Call("YaPI::SERVICES::Execute",{ + "name" => ["s","collectd"], + "action" => ["s","restart"] + }) + Rails.logger.info "Calling restart of collectd with result: #{ret.inspect}" + rescue Exception => e + Rails.logger.warn "Exception thrown by DBus while restarting collectd #{e.inspect}" + #restarting collectd is optional, so it should not do anything + end + end def to_xml( options = {} ) diff --git a/plugins/time/package/yast2-webservice-time.changes b/plugins/time/package/yast2-webservice-time.changes index cfbb3a1..ffa5979 100644 --- a/plugins/time/package/yast2-webservice-time.changes +++ b/plugins/time/package/yast2-webservice-time.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 24 15:46:56 UTC 2009 - jreidinger(a)novell.com + +- optionally(if not possible, then ignore it) restart collectd if + time is changed (bnc#557929) +- 0.0.11 + +------------------------------------------------------------------- Wed Nov 18 08:29:49 UTC 2009 - jreidinger(a)novell.com - prevent timeout error also if timezone or UTC status and cause diff --git a/plugins/time/package/yast2-webservice-time.spec b/plugins/time/package/yast2-webservice-time.spec index df02840..2738aa8 100644 --- a/plugins/time/package/yast2-webservice-time.spec +++ b/plugins/time/package/yast2-webservice-time.spec @@ -14,7 +14,7 @@ PreReq: yast2-webservice License: GPL v2 only Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.10 +Version: 0.0.11 Release: 0 Summary: YaST2 - Webservice - Time Source: www.tar.bz2 diff --git a/plugins/time/test/unit/systemtime_test.rb b/plugins/time/test/unit/systemtime_test.rb index d03713e..4f8fb4e 100644 --- a/plugins/time/test/unit/systemtime_test.rb +++ b/plugins/time/test/unit/systemtime_test.rb @@ -1,5 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + "/../test_helper") require 'systemtime' +require 'mocha' class SystemtimeTest < ActiveSupport::TestCase @@ -36,14 +37,14 @@ class SystemtimeTest < ActiveSupport::TestCase } WRITE_ARGUMENTS_NONE = { - :timezone=> "America/Kentucky/Monticello", - :utcstatus=> "false" + "timezone"=> "America/Kentucky/Monticello", + "utcstatus"=> "false" } WRITE_ARGUMENTS_TIME = { - :timezone=> "America/Kentucky/Monticello", - :utcstatus=> "false", - :time => "2009-07-02 - 12:18:00" + "timezone"=> "America/Kentucky/Monticello", + "utcstatus"=> "false", + "time" => "2009-07-02 - 12:18:00" } WRITE_ARGUMENTS_NTP = { @@ -68,8 +69,12 @@ class SystemtimeTest < ActiveSupport::TestCase end def test_setter_without_time - YastService.stubs(:Call).with("YaPI::TIME::Write",WRITE_ARGUMENTS_NONE).returns(true) - YastService.expects(:Call).once + x= YastService.stubs(:Call) + x.with("YaPI::TIME::Write",WRITE_ARGUMENTS_NONE).once + x.with("YaPI::SERVICES::Execute",{ + "name" => ["s","collectd"], + "action" => ["s","restart"] + }).once @model.timezone = "America/Kentucky/Monticello" @model.utcstatus = "false" @@ -77,8 +82,12 @@ class SystemtimeTest < ActiveSupport::TestCase end def test_setter_with_time - YastService.stubs(:Call).with("YaPI::TIME::Write",WRITE_ARGUMENTS_TIME).returns(true) - YastService.expects(:Call).once + x= YastService.stubs(:Call) + x.with("YaPI::TIME::Write",WRITE_ARGUMENTS_TIME).returns(true).once + x.with("YaPI::SERVICES::Execute",{ + "name" => ["s","collectd"], + "action" => ["s","restart"] + }).once @model.timezone = "America/Kentucky/Monticello" @model.utcstatus = "false" @@ -91,8 +100,13 @@ class SystemtimeTest < ActiveSupport::TestCase msg_mock = mock() msg_mock.stubs(:error_name).returns("org.freedesktop.DBus.Error.NoReply") msg_mock.stubs(:params).returns(["test","test"]) - YastService.stubs(:Call).with("YaPI::TIME::Write",WRITE_ARGUMENTS_TIME).raises(DBus::Error,msg_mock) - YastService.expects(:Call).once + x= YastService.stubs(:Call) + x.with("YaPI::TIME::Write",WRITE_ARGUMENTS_TIME).raises(DBus::Error,msg_mock).once +#also if error is raised due to time moving collectd must be restarted + x.with("YaPI::SERVICES::Execute",{ + "name" => ["s","collectd"], + "action" => ["s","restart"] + }).once @model.timezone = "America/Kentucky/Monticello" @model.utcstatus = "false" -- 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] r59742 - /tags/stable-2_19_0/installation/
by kmachalkova＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: kmachalkova Date: Tue Nov 24 16:29:57 2009 New Revision: 59742 URL: http://svn.opensuse.org/viewcvs/yast?rev=59742&view=rev Log: Created tag stable-2_19_0 for installation Added: tags/stable-2_19_0/installation/ - copied from r59741, trunk/installation/ -- 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] <rest-service> master : say that configuration uses yaml and link do yaml documentation
by Martin Kudlvasr 24 Nov '09

24 Nov '09

ref: refs/heads/master commit 510407d274bb52aa85a648419e55c5fe5e8afea2 Author: Martin Kudlvasr <mkudlvasr(a)suse.cz> Date: Tue Nov 24 16:25:34 2009 +0100 say that configuration uses yaml and link do yaml documentation --- plugins/eulas/doc/README_FOR_APP | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/plugins/eulas/doc/README_FOR_APP b/plugins/eulas/doc/README_FOR_APP index 0222b49..7f4c060 100644 --- a/plugins/eulas/doc/README_FOR_APP +++ b/plugins/eulas/doc/README_FOR_APP @@ -75,7 +75,16 @@ Configuration of EULAs has the same effect as accepting the license via the UI. - Example eulas.yml File: + YAML + ---- + + EULAs configuration file /etc/webyast/eulas.yml (as well as other WebYaST configuration + files) is written in YAML language. You can read more about it at www.yaml.org . + + Examples + -------- + + Example of /etc/webyast/eulas.yml File: eulas_example.yml -- 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] r59741 - /trunk/installation/src/clients/inst_release_notes.ycp
by kmachalkova＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: kmachalkova Date: Tue Nov 24 16:25:18 2009 New Revision: 59741 URL: http://svn.opensuse.org/viewcvs/yast?rev=59741&view=rev Log: er, syntax error Modified: trunk/installation/src/clients/inst_release_notes.ycp Modified: trunk/installation/src/clients/inst_release_notes.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_re… ============================================================================== --- trunk/installation/src/clients/inst_release_notes.ycp (original) +++ trunk/installation/src/clients/inst_release_notes.ycp Tue Nov 24 16:25:18 2009 @@ -185,7 +185,7 @@ `ReplacePoint(`id(`content_rp), `RichText (`id (`relnotescontent), "") ) - ), + )), `HWeight( 20,`Empty() ) ) ); -- 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] r59740 - /trunk/installation/VERSION
by kmachalkova＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: kmachalkova Date: Tue Nov 24 16:19:24 2009 New Revision: 59740 URL: http://svn.opensuse.org/viewcvs/yast?rev=59740&view=rev Log: bump Modified: trunk/installation/VERSION Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=59740&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Tue Nov 24 16:19:24 2009 @@ -1 +1 @@ -2.18.34 +2.19.0 -- 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] r59739 - in /trunk/installation: ./ agents/ control/ package/ src/clients/ src/inst_finish/
by kmachalkova＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: kmachalkova Date: Tue Nov 24 16:19:03 2009 New Revision: 59739 URL: http://svn.opensuse.org/viewcvs/yast?rev=59739&view=rev Log: Cumulative patch with SLE11 SP1 features: FaTE#307555, FaTE#306167 Added: trunk/installation/agents/cfg_boot.scr Modified: trunk/installation/control/control.SLED.xml trunk/installation/control/control.SLES.xml trunk/installation/control/control.openSUSE.xml trunk/installation/control/control.rnc trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_release_notes.ycp trunk/installation/src/inst_finish/save_config_finish.ycp trunk/installation/yast2-installation.spec.in Added: trunk/installation/agents/cfg_boot.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/agents/cfg_boot.scr… ============================================================================== --- trunk/installation/agents/cfg_boot.scr (added) +++ trunk/installation/agents/cfg_boot.scr Tue Nov 24 16:19:03 2009 @@ -0,0 +1,15 @@ +/** + * File: + * cfg_boot.scr + * Summary: + * SCR Agent for reading/writing /etc/sysconfig/boot + * using the sysconfig-agent + * + * Read/Sets the values defined in <tt>/etc/sysconfig/boot</tt> + * in an easy manner. + */ +.sysconfig.boot + +`ag_ini( + `SysConfigFile("/etc/sysconfig/boot") +) Modified: trunk/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLED.xml (original) +++ trunk/installation/control/control.SLED.xml Tue Nov 24 16:19:03 2009 @@ -17,6 +17,8 @@  <write_hostname_to_hosts config:type="boolean">true</write_hostname_to_hosts> +  + <run_init_scripts_in_parallel config:type="boolean">true</run_init_scripts_in_parallel> <incomplete_translation_treshold>95</incomplete_translation_treshold> <inform_about_suboptimal_distribution config:type="boolean">true</inform_about_suboptimal_distribution> Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Tue Nov 24 16:19:03 2009 @@ -17,6 +17,8 @@  <write_hostname_to_hosts config:type="boolean">false</write_hostname_to_hosts> +  + <run_init_scripts_in_parallel config:type="boolean">false</run_init_scripts_in_parallel> <incomplete_translation_treshold>95</incomplete_translation_treshold> <inform_about_suboptimal_distribution config:type="boolean">true</inform_about_suboptimal_distribution> Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Tue Nov 24 16:19:03 2009 @@ -17,6 +17,8 @@  <write_hostname_to_hosts config:type="boolean">true</write_hostname_to_hosts> +  + <run_init_scripts_in_parallel config:type="boolean">true</run_init_scripts_in_parallel> <incomplete_translation_treshold>95</incomplete_translation_treshold> <inform_about_suboptimal_distribution config:type="boolean">true</inform_about_suboptimal_distribution> Modified: trunk/installation/control/control.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.rnc… ============================================================================== --- trunk/installation/control/control.rnc (original) +++ trunk/installation/control/control.rnc Tue Nov 24 16:19:03 2009 @@ -46,6 +46,7 @@ | firewall_enable_ssh | firewall_enable_ssh | write_hostname_to_hosts + | run_init_scripts_in_parallel | inform_about_suboptimal_distribution | skip_language_dialog | enable_clone @@ -100,6 +101,7 @@ enable_firewall = element enable_firewall { BOOLEAN } firewall_enable_ssh = element firewall_enable_ssh { BOOLEAN } write_hostname_to_hosts = element write_hostname_to_hosts { BOOLEAN } +run_init_scripts_in_parallel = element run_init_scripts_in_parallel { BOOLEAN } inform_about_suboptimal_distribution = element inform_about_suboptimal_distribution { BOOLEAN } skip_language_dialog = element skip_language_dialog { BOOLEAN } enable_clone = element enable_clone { BOOLEAN } Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Nov 24 16:19:03 2009 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Tue Nov 24 16:13:31 CET 2009 - kmachalkova(a)suse.cz + +Cumulative patch with SLE11 SP1 features: +- In TUI (ncurses), use plain text (.txt) file with release notes, + if found (FaTE#306167) +- Set /etc/sysconfig/boot:RUN_PARALLEL according to corresponding + value in control file (FaTE#307555) +- 2.19.0 + +------------------------------------------------------------------- Thu Nov 19 16:51:55 CET 2009 - locilka(a)suse.cz - Added control file configuration option require_registration Modified: trunk/installation/src/clients/inst_release_notes.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_re… ============================================================================== --- trunk/installation/src/clients/inst_release_notes.ycp (original) +++ trunk/installation/src/clients/inst_release_notes.ycp Tue Nov 24 16:19:03 2009 @@ -182,8 +182,9 @@ `ComboBox (`id (`lang), `opt (`notify), _("&Language"), []) ) ), - `RichText (`id (`relnotescontent), "") - ) + `ReplacePoint(`id(`content_rp), + `RichText (`id (`relnotescontent), "") + ) ), `HWeight( 20,`Empty() ) ) @@ -243,12 +244,31 @@ if (UI::WidgetExists(`productsel) && (size(relnotesproducts) < 2)) UI::ChangeWidget (`id(`productsel), `Enabled, false); + boolean UsePlainText ( string file ) { + boolean ret = UI::TextMode() && FileUtils::Exists(file); + if (ret) + y2milestone("Found .txt file with release notes, will use it for TUI."); + return ret; + } + void RedrawRelnotesLang (string use_file) { - string contents = (string) SCR::Read (.target.string, use_file); + string text_file = regexpsub(use_file, "^(.*)\.rtf$", "\\1") + ".txt"; + boolean plain_text = UsePlainText( text_file ); + + string contents = (string) SCR::Read (.target.string, + plain_text ? text_file : use_file ); + if (contents == nil || contents == "") { y2error ("Wrong relnotesfile: %1", use_file); } else { - UI::ChangeWidget (`id(`relnotescontent), `Value, contents); + if (plain_text) { + UI::ReplaceWidget( `id(`content_rp), + `RichText(`id(`relnotescontent),`opt(`plainText), contents) ); + } + else { + UI::ReplaceWidget( `id(`content_rp), + `RichText(`id(`relnotescontent), contents ) ); + } } } Modified: trunk/installation/src/inst_finish/save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/sav… ============================================================================== --- trunk/installation/src/inst_finish/save_config_finish.ycp (original) +++ trunk/installation/src/inst_finish/save_config_finish.ycp Tue Nov 24 16:19:03 2009 @@ -141,11 +141,20 @@ contains (Product::flags, "usercwd") ? "yes" : "no"); SCR::Write (.sysconfig.suseconfig, nil); - // FIXME text freeze: progress (update count in Info too) + Progress::NextStep (); + // progress step title + Progress::Title (_("Saving security settings...")); SCR::Write (.sysconfig.security.CHECK_SIGNATURES, SignatureCheckDialogs::CheckSignatures ()); SCR::Write (.sysconfig.security, nil); + Progress::NextStep (); + // progress step title + Progress::Title (_("Saving boot scripts settings...")); + boolean run_in_parallel = ProductFeatures::GetBooleanFeature( "globals", "run_init_scripts_in_parallel"); + SCR::Write (.sysconfig.boot.RUN_PARALLEL, run_in_parallel ? "yes" : "no" ); + SCR::Write (.sysconfig.boot, nil); + // save supportconfig if(SCR::Read(.target.size,"/etc/install.inf") > 0) { string url = (string)SCR::Read(.etc.install_inf.supporturl); Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.… ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Tue Nov 24 16:19:03 2009 @@ -138,6 +138,7 @@ # agents @scrconfdir@/etc_passwd.scr +@scrconfdir@/cfg_boot.scr @scrconfdir@/cfg_windowmanager.scr @scrconfdir@/cfg_fam.scr @scrconfdir@/etc_install_inf.scr -- 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] <web-client> master : fix version number in spec file
by J.Daniel Schmidt 24 Nov '09

24 Nov '09

ref: refs/heads/master commit 3f0dc6abe9f3ec69823cf33bfb111e61bdd28a46 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Tue Nov 24 16:13:54 2009 +0100 fix version number in spec file --- webclient/package/yast2-webclient.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index 789a438..e56d4bf 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -17,7 +17,7 @@ PreReq: rubygem-gettext_rails License: LGPL v2.1;ASLv2.0 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.20 +Version: 0.0.21 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 -- 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] <web-client> backgroud_patches_bnc550934 : fix version number in spec file
by J.Daniel Schmidt 24 Nov '09

24 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit 3f0dc6abe9f3ec69823cf33bfb111e61bdd28a46 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Tue Nov 24 16:13:54 2009 +0100 fix version number in spec file --- webclient/package/yast2-webclient.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index 789a438..e56d4bf 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -17,7 +17,7 @@ PreReq: rubygem-gettext_rails License: LGPL v2.1;ASLv2.0 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.20 +Version: 0.0.21 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 -- 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] r59738 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp
by fehr＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: fehr Date: Tue Nov 24 16:13:44 2009 New Revision: 59738 URL: http://svn.opensuse.org/viewcvs/yast?rev=59738&view=rev Log: enabled to set "noauto" option for LUKS-encrypted volumes Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Nov 24 16:13:44 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Nov 24 14:59:54 CET 2009 - fehr(a)suse.de + +- enabled to set "noauto" option for LUKS-encrypted volumes + +------------------------------------------------------------------- Fri Nov 20 18:01:15 CET 2009 - aschnell(a)suse.de - added mount graph (requires libstorage 2.19.1) Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Tue Nov 24 16:13:44 2009 @@ -717,12 +717,7 @@ if( UI::WidgetExists( `id("opt_user") )) { UI::ChangeWidget( `id("opt_user"), `Enabled, - new["enc_type"]:`none==`none || new["noauto"]:false ); - } - if( UI::WidgetExists( `id("opt_noauto") )) - { - UI::ChangeWidget( `id("opt_noauto"), `Enabled, - new["enc_type"]:`none==`none || new["noauto"]:false ); + new["enc_type"]:`none==`none ); } if( UI::WidgetExists( `id("opt_quota") )) { @@ -739,15 +734,6 @@ { ret = UI::UserInput(); y2milestone( "FstabOptions ret %1", ret ); - if( ret == "opt_noauto" ) - { - if( UI::WidgetExists( `id("opt_user") )) - { - boolean val = (boolean)UI::QueryWidget( `id("opt_noauto" ), `Value ); - UI::ChangeWidget( `id("opt_user"), `Enabled, - new["enc_type"]:`none==`none || val ); - } - } if( ret == `ok ) { if( UI::WidgetExists( `id(`mt_group) )) -- 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] <web-client> master : add short description of the process of accepting EULAs
by Martin Kudlvasr 24 Nov '09

24 Nov '09

ref: refs/heads/master commit 796b56fe88de0f9b1109145c947844a8983f6471 Author: Martin Kudlvasr <mkudlvasr(a)suse.cz> Date: Tue Nov 24 16:12:47 2009 +0100 add short description of the process of accepting EULAs --- plugins/eulas/README | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/plugins/eulas/README b/plugins/eulas/README index fb3b0d4..f2ff394 100644 --- a/plugins/eulas/README +++ b/plugins/eulas/README @@ -1,7 +1,16 @@ EULAs ===== -Plugin for accepting EULAs. +Show the end user licence agreement (EULA) to the user. +User is shown english text of the EULA. He can also choose from the available +translations using the drop-down list above the text. If he agrees to the terms, +he chooses "Yes, I agree to the licence agreement" and clicks Next. + +If the user does not agree to the license, he will be not allowed to continue +through the basesystem setup workflow. + +For information about, how to configure EULAs, please see documentation of` +yast2-webservice-eulas. Copyright (c) 2009 Novell, released under the GPL2 license -- 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] <web-client> backgroud_patches_bnc550934 : add short description of the process of accepting EULAs
by Martin Kudlvasr 24 Nov '09

24 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit 796b56fe88de0f9b1109145c947844a8983f6471 Author: Martin Kudlvasr <mkudlvasr(a)suse.cz> Date: Tue Nov 24 16:12:47 2009 +0100 add short description of the process of accepting EULAs --- plugins/eulas/README | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/plugins/eulas/README b/plugins/eulas/README index fb3b0d4..f2ff394 100644 --- a/plugins/eulas/README +++ b/plugins/eulas/README @@ -1,7 +1,16 @@ EULAs ===== -Plugin for accepting EULAs. +Show the end user licence agreement (EULA) to the user. +User is shown english text of the EULA. He can also choose from the available +translations using the drop-down list above the text. If he agrees to the terms, +he chooses "Yes, I agree to the licence agreement" and clicks Next. + +If the user does not agree to the license, he will be not allowed to continue +through the basesystem setup workflow. + +For information about, how to configure EULAs, please see documentation of` +yast2-webservice-eulas. Copyright (c) 2009 Novell, released under the GPL2 license -- 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] <web-client> master : catch exception COLLECTD_SYNC_ERROR and show it to the user (#bnc555204)
by Stefan Schubert 24 Nov '09

24 Nov '09

ref: refs/heads/master commit abf19de74d0511d79939b189cc7b686bd1c4b625 Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Nov 24 16:10:46 2009 +0100 catch exception COLLECTD_SYNC_ERROR and show it to the user (#bnc555204) --- .../status/package/yast2-webclient-status.changes | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/plugins/status/package/yast2-webclient-status.changes b/plugins/status/package/yast2-webclient-status.changes index 763f746..0843861 100644 --- a/plugins/status/package/yast2-webclient-status.changes +++ b/plugins/status/package/yast2-webclient-status.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Nov 24 16:10:22 CET 2009 - schubi(a)suse.de + +- catch exception COLLECTD_SYNC_ERROR and show it user (#bnc555204) + +------------------------------------------------------------------- Tue Nov 24 11:37:57 CET 2009 - kkaempf(a)suse.de - Correct <div> for log messages (bnc#549022> -- 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] <web-client> backgroud_patches_bnc550934 : catch exception COLLECTD_SYNC_ERROR and show it to the user (#bnc555204)
by Stefan Schubert 24 Nov '09

24 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit abf19de74d0511d79939b189cc7b686bd1c4b625 Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Nov 24 16:10:46 2009 +0100 catch exception COLLECTD_SYNC_ERROR and show it to the user (#bnc555204) --- .../status/package/yast2-webclient-status.changes | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/plugins/status/package/yast2-webclient-status.changes b/plugins/status/package/yast2-webclient-status.changes index 763f746..0843861 100644 --- a/plugins/status/package/yast2-webclient-status.changes +++ b/plugins/status/package/yast2-webclient-status.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Nov 24 16:10:22 CET 2009 - schubi(a)suse.de + +- catch exception COLLECTD_SYNC_ERROR and show it user (#bnc555204) + +------------------------------------------------------------------- Tue Nov 24 11:37:57 CET 2009 - kkaempf(a)suse.de - Correct <div> for log messages (bnc#549022> -- 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] <web-client> master : set organization and unit name in SSL certificate (bnc#557761), version 0.0.21
by J.Daniel Schmidt 24 Nov '09

24 Nov '09

ref: refs/heads/master commit f5ded2d09b0ff8982c80364c727d332f27922df3 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Tue Nov 24 16:10:40 2009 +0100 set organization and unit name in SSL certificate (bnc#557761), version 0.0.21 --- webclient/package/check-create-certificate.pl | 55 ++++++++++++++---------- webclient/package/yast2-webclient.changes | 6 +++ webclient/package/yastwc | 2 +- 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/webclient/package/check-create-certificate.pl b/webclient/package/check-create-certificate.pl index 8fb27a2..424f163 100755 --- a/webclient/package/check-create-certificate.pl +++ b/webclient/package/check-create-certificate.pl @@ -30,25 +30,33 @@ sub usage print STDERR " if omitted exitance of certificate files will only be checked\n"; print STDERR " -f [--force] force to overwrite certificate\n"; print STDERR " -h [--help] this help\n"; - print STDERR " -H [--hostname] <name> define hostname to use for certificate\n"; - print STDERR " if omitted defaults to 'hostname --fqdn'\n"; - print STDERR " -C [--certfile] <file> define certificate file\n"; + print STDERR " -H [--hostname] <name> defines hostname to use as CN for certificate\n"; + print STDERR " if omitted it will use the FQDN hostname or just the hostname or the default CN\n"; + print STDERR " -D [--defaultcn] <name> defines the default CN that is used if no FQDN can be found\n"; + print STDERR " hostnames like 'localhost' and 'linux' will be overwritten by this as well\n"; + print STDERR " -C [--certfile] <file> defines certificate file\n"; print STDERR " if omitted defaults to /etc/ssl/certs/self-signed-certificate.pem\n"; - print STDERR " -K [--keyfile] <file> define key file\n"; + print STDERR " -K [--keyfile] <file> defines key file\n"; print STDERR " if omitted defaults to /etc/ssl/private/self-signed-certificate.key\n"; - print STDERR " -B [--combinedfile] <file> define combination file of key and certificate\n"; + print STDERR " -B [--combinedfile] <file> defines combination file of key and certificate\n"; print STDERR " will not be created or checked if omitted\n"; + print STDERR " -O [--organization] <org> sets the organization name in the certificate\n"; + print STDERR " -U [--unit] <unit> sets the organizational unit name in the certificate\n"; print STDERR "\n"; } -sub create_certificate($$$$) +sub create_certificate($$$$$$) { my $fqdn = shift || return undef; + my $org = shift || ''; + my $orgunit = shift || ''; my $CERTFILE = shift || return undef; my $KEYFILE = shift || return undef; my $COMBINEDFILE = shift || undef; chomp $fqdn; + chomp $org; + chomp $orgunit; chomp $CERTFILE; chomp $KEYFILE; chomp $COMBINEDFILE if defined $COMBINEDFILE; @@ -63,6 +71,8 @@ prompt=no commonName = $fqdn emailAddress = root\@$fqdn "; + $config .="organizationName = $org\n" if ( $org ne '' ); + $config .="organizationalUnitName = $orgunit\n" if ( $orgunit ne '' ); my $CNF = `mktemp /tmp/create-ssl-config-XXXXX`; my $CERT = `mktemp /tmp/create-ssl-cert-XXXXX`; @@ -132,10 +142,13 @@ emailAddress = root\@$fqdn ################################# MAIN ######################################## -my ($create, $force, $hostname, $certfile, $keyfile, $combinedfile, $help); +my ($create, $force, $hostname, $certfile, $keyfile, $combinedfile, $help, $organization, $unit, $defaultcn); my $result = GetOptions ("create|c" => \$create, "force|f" => \$force, "hostname|H=s" => \$hostname, + "defaultcn|D=s" => \$defaultcn, + "organization|O=s" => \$organization, + "unit|U=s" => \$unit, "certfile|C=s" => \$certfile, "keyfile|K=s" => \$keyfile, "combinedfile|B=s" => \$combinedfile, @@ -176,25 +189,21 @@ if (defined $create) } } - $hostname = `hostname --fqdn` unless defined $hostname; - chomp $hostname if defined $hostname; - if ( (not defined $hostname) || $hostname =~ /^$/) + my @HOSTNAMES = ('localhost'); + push @HOSTNAMES, $defaultcn; + push @HOSTNAMES, `hostname`; + push @HOSTNAMES, `hostname --fqdn`; + push @HOSTNAMES, $hostname; + + foreach my $H (@HOSTNAMES) { - # do not abort, just create a certificate (bnc#557752) - #print STDERR "Hostname missing or invalid. Aborting.\n"; - #exit 1; - - print STDERR "No fully qualified domain name can be found. Please fix your DNS setup.\n"; - print STDERR "Using only the hostname for SSL certificate.\n"; - $hostname = `hostname`; - chomp $hostname if defined $hostname; - if ( (not defined $hostname) || $hostname =~ /^$/) - { - $hostname = 'localhost'; - } + next unless (defined $H); + chomp $H; + $hostname = $H unless ( $H !~ /^$/ && $H !~ /^linux$/i && $H !~ /^localhost$/i ); } + $hostname = 'localhost' unless ( defined $hostname && $hostname !~ /^$/ ); - if ( create_certificate( $hostname, $certfile, $keyfile, $combinedfile ) ) + if ( create_certificate( $hostname, $organization, $unit, $certfile, $keyfile, $combinedfile ) ) { print "Successfully created certificate.\n"; exit 0; diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index 5dbf1cb..0f9db2e 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 24 16:03:39 CET 2009 - jdsn(a)suse.de + +- set organization and unit name in SSL certificate (bnc#557761) +- 0.0.21 + +------------------------------------------------------------------- Mon Nov 23 18:15:24 CET 2009 - jdsn(a)suse.de - create an SSL certificate with the best hostname (bnc#557752) diff --git a/webclient/package/yastwc b/webclient/package/yastwc index f25a61a..a1ecf25 100755 --- a/webclient/package/yastwc +++ b/webclient/package/yastwc @@ -179,7 +179,7 @@ case "$1" in if [ ! -e $COMBINEDCERTFILE ] then echo "No certificate found. Creating one now." - if ! /usr/sbin/check-create-certificate.pl -c -C $CERTIFICATEFILE -K $CERTKEYFILE -B $COMBINEDCERTFILE >/srv/www/yast/log/check-create-certificate.log 2>&1 + if ! /usr/sbin/check-create-certificate.pl -c -C $CERTIFICATEFILE -K $CERTKEYFILE -B $COMBINEDCERTFILE -D webyast -O WebYaST -U WebYaST >/srv/www/yast/log/check-create-certificate.log 2>&1 then echo -n "Can not create certificate. Please see /srv/www/yast/log/check-create-certificate.log for details." rc_failed -- 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] <web-client> backgroud_patches_bnc550934 : set organization and unit name in SSL certificate (bnc#557761), version 0.0.21
by J.Daniel Schmidt 24 Nov '09

24 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit f5ded2d09b0ff8982c80364c727d332f27922df3 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Tue Nov 24 16:10:40 2009 +0100 set organization and unit name in SSL certificate (bnc#557761), version 0.0.21 --- webclient/package/check-create-certificate.pl | 55 ++++++++++++++---------- webclient/package/yast2-webclient.changes | 6 +++ webclient/package/yastwc | 2 +- 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/webclient/package/check-create-certificate.pl b/webclient/package/check-create-certificate.pl index 8fb27a2..424f163 100755 --- a/webclient/package/check-create-certificate.pl +++ b/webclient/package/check-create-certificate.pl @@ -30,25 +30,33 @@ sub usage print STDERR " if omitted exitance of certificate files will only be checked\n"; print STDERR " -f [--force] force to overwrite certificate\n"; print STDERR " -h [--help] this help\n"; - print STDERR " -H [--hostname] <name> define hostname to use for certificate\n"; - print STDERR " if omitted defaults to 'hostname --fqdn'\n"; - print STDERR " -C [--certfile] <file> define certificate file\n"; + print STDERR " -H [--hostname] <name> defines hostname to use as CN for certificate\n"; + print STDERR " if omitted it will use the FQDN hostname or just the hostname or the default CN\n"; + print STDERR " -D [--defaultcn] <name> defines the default CN that is used if no FQDN can be found\n"; + print STDERR " hostnames like 'localhost' and 'linux' will be overwritten by this as well\n"; + print STDERR " -C [--certfile] <file> defines certificate file\n"; print STDERR " if omitted defaults to /etc/ssl/certs/self-signed-certificate.pem\n"; - print STDERR " -K [--keyfile] <file> define key file\n"; + print STDERR " -K [--keyfile] <file> defines key file\n"; print STDERR " if omitted defaults to /etc/ssl/private/self-signed-certificate.key\n"; - print STDERR " -B [--combinedfile] <file> define combination file of key and certificate\n"; + print STDERR " -B [--combinedfile] <file> defines combination file of key and certificate\n"; print STDERR " will not be created or checked if omitted\n"; + print STDERR " -O [--organization] <org> sets the organization name in the certificate\n"; + print STDERR " -U [--unit] <unit> sets the organizational unit name in the certificate\n"; print STDERR "\n"; } -sub create_certificate($$$$) +sub create_certificate($$$$$$) { my $fqdn = shift || return undef; + my $org = shift || ''; + my $orgunit = shift || ''; my $CERTFILE = shift || return undef; my $KEYFILE = shift || return undef; my $COMBINEDFILE = shift || undef; chomp $fqdn; + chomp $org; + chomp $orgunit; chomp $CERTFILE; chomp $KEYFILE; chomp $COMBINEDFILE if defined $COMBINEDFILE; @@ -63,6 +71,8 @@ prompt=no commonName = $fqdn emailAddress = root\@$fqdn "; + $config .="organizationName = $org\n" if ( $org ne '' ); + $config .="organizationalUnitName = $orgunit\n" if ( $orgunit ne '' ); my $CNF = `mktemp /tmp/create-ssl-config-XXXXX`; my $CERT = `mktemp /tmp/create-ssl-cert-XXXXX`; @@ -132,10 +142,13 @@ emailAddress = root\@$fqdn ################################# MAIN ######################################## -my ($create, $force, $hostname, $certfile, $keyfile, $combinedfile, $help); +my ($create, $force, $hostname, $certfile, $keyfile, $combinedfile, $help, $organization, $unit, $defaultcn); my $result = GetOptions ("create|c" => \$create, "force|f" => \$force, "hostname|H=s" => \$hostname, + "defaultcn|D=s" => \$defaultcn, + "organization|O=s" => \$organization, + "unit|U=s" => \$unit, "certfile|C=s" => \$certfile, "keyfile|K=s" => \$keyfile, "combinedfile|B=s" => \$combinedfile, @@ -176,25 +189,21 @@ if (defined $create) } } - $hostname = `hostname --fqdn` unless defined $hostname; - chomp $hostname if defined $hostname; - if ( (not defined $hostname) || $hostname =~ /^$/) + my @HOSTNAMES = ('localhost'); + push @HOSTNAMES, $defaultcn; + push @HOSTNAMES, `hostname`; + push @HOSTNAMES, `hostname --fqdn`; + push @HOSTNAMES, $hostname; + + foreach my $H (@HOSTNAMES) { - # do not abort, just create a certificate (bnc#557752) - #print STDERR "Hostname missing or invalid. Aborting.\n"; - #exit 1; - - print STDERR "No fully qualified domain name can be found. Please fix your DNS setup.\n"; - print STDERR "Using only the hostname for SSL certificate.\n"; - $hostname = `hostname`; - chomp $hostname if defined $hostname; - if ( (not defined $hostname) || $hostname =~ /^$/) - { - $hostname = 'localhost'; - } + next unless (defined $H); + chomp $H; + $hostname = $H unless ( $H !~ /^$/ && $H !~ /^linux$/i && $H !~ /^localhost$/i ); } + $hostname = 'localhost' unless ( defined $hostname && $hostname !~ /^$/ ); - if ( create_certificate( $hostname, $certfile, $keyfile, $combinedfile ) ) + if ( create_certificate( $hostname, $organization, $unit, $certfile, $keyfile, $combinedfile ) ) { print "Successfully created certificate.\n"; exit 0; diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index 5dbf1cb..0f9db2e 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 24 16:03:39 CET 2009 - jdsn(a)suse.de + +- set organization and unit name in SSL certificate (bnc#557761) +- 0.0.21 + +------------------------------------------------------------------- Mon Nov 23 18:15:24 CET 2009 - jdsn(a)suse.de - create an SSL certificate with the best hostname (bnc#557752) diff --git a/webclient/package/yastwc b/webclient/package/yastwc index f25a61a..a1ecf25 100755 --- a/webclient/package/yastwc +++ b/webclient/package/yastwc @@ -179,7 +179,7 @@ case "$1" in if [ ! -e $COMBINEDCERTFILE ] then echo "No certificate found. Creating one now." - if ! /usr/sbin/check-create-certificate.pl -c -C $CERTIFICATEFILE -K $CERTKEYFILE -B $COMBINEDCERTFILE >/srv/www/yast/log/check-create-certificate.log 2>&1 + if ! /usr/sbin/check-create-certificate.pl -c -C $CERTIFICATEFILE -K $CERTKEYFILE -B $COMBINEDCERTFILE -D webyast -O WebYaST -U WebYaST >/srv/www/yast/log/check-create-certificate.log 2>&1 then echo -n "Can not create certificate. Please see /srv/www/yast/log/check-create-certificate.log for details." rc_failed -- 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] <web-client> master : catch exception COLLECTD_SYNC_ERROR and show it to the user (#bnc555204)
by Stefan Schubert 24 Nov '09

24 Nov '09

ref: refs/heads/master commit 61671be0674cc61c28f51bddb47aebb55c6d1052 Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Nov 24 16:10:02 2009 +0100 catch exception COLLECTD_SYNC_ERROR and show it to the user (#bnc555204) --- .../status/app/controllers/status_controller.rb | 22 ++++++++++++++----- .../app/views/status/_status_summary.html.erb | 19 ++++++---------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/plugins/status/app/controllers/status_controller.rb b/plugins/status/app/controllers/status_controller.rb index 1202af1..887479d 100644 --- a/plugins/status/app/controllers/status_controller.rb +++ b/plugins/status/app/controllers/status_controller.rb @@ -165,7 +165,9 @@ class StatusController < ApplicationController error_hash = Hash.from_xml error.response.body logger.warn error_hash.inspect if error_hash["error"] && - (error_hash["error"]["type"] == "SERVICE_NOT_RUNNING" || error_hash["error"]["type"] == "NO_PERM") + (error_hash["error"]["type"] == "SERVICE_NOT_RUNNING" || + error_hash["error"]["type"] == "COLLECTD_SYNC_ERROR" || + error_hash["error"]["type"] == "NO_PERM") flash[:error] = error_hash["error"]["description"] else raise error @@ -176,25 +178,33 @@ class StatusController < ApplicationController def show_summary return unless client_permissions begin + level = "ok" if create_data status = limits_reached status = (_("Limits exceeded for %s") % status) unless status.empty? + level = "error" else status = _("No data found for showing system status.") + level = "warning" end - render :partial => "status_summary", :locals => { :status => status, :error => nil } + render :partial => "status_summary", :locals => { :status => status, :level => level, :error => nil } rescue ActiveResource::ClientError => error logger.warn error.inspect - render :partial => "status_summary", :locals => { :status => nil, :error => ClientException.new(error) } and return + level = "error" + render :partial => "status_summary", :locals => { :status => nil, :level => "error", :error => ClientException.new(error) } and return rescue ActiveResource::ServerError => error error_hash = Hash.from_xml error.response.body + level = "error" logger.warn error_hash.inspect if error_hash["error"] && - (error_hash["error"]["type"] == "SERVICE_NOT_RUNNING" || error_hash["error"]["type"] == "NO_PERM") + (error_hash["error"]["type"] == "SERVICE_NOT_RUNNING" || + error_hash["error"]["type"] == "NO_PERM" || + error_hash["error"]["type"] == "COLLECTD_SYNC_ERROR") + level = "warning" if error_hash["error"]["type"] == "COLLECTD_SYNC_ERROR" #it is a warning only status = error_hash["error"]["description"] - render :partial => "status_summary", :locals => { :status => status, :error => nil } + render :partial => "status_summary", :locals => { :status => status, :level => level, :error => nil } else - render :partial => "status_summary", :locals => { :status => nil, :error => ClientException.new(error) } + render :partial => "status_summary", :locals => { :status => nil, :level => level, :error => ClientException.new(error) } end end end diff --git a/plugins/status/app/views/status/_status_summary.html.erb b/plugins/status/app/views/status/_status_summary.html.erb index 3950e6e..7f75da8 100644 --- a/plugins/status/app/views/status/_status_summary.html.erb +++ b/plugins/status/app/views/status/_status_summary.html.erb @@ -1,18 +1,13 @@ <%= report_error(error, _("An problem occured when loading status information.")) if error %> <div class="status_status"> - <% unless status %> - <div class="status-icon warning"></div> - <span><%= _("No status information available") %></span> - <% else %> - <% link_to "status" do %> - <% if !status.blank? %> - <div class="status-icon error"></div> - <span><%= status %></span> - <% else %> - <div class="status-icon ok"></div> - <span><%= _("Your system is healthy.") %></span> - <% end %> + <% link_to "status" do %> + <% if !status.blank? %> + <div class="status-icon <%= level %>"></div> + <span><%= status %></span> + <% else %> + <div class="status-icon ok"></div> + <span><%= _("Your system is healthy.") %></span> <% end %> <% end %> </div> -- 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] <web-client> backgroud_patches_bnc550934 : catch exception COLLECTD_SYNC_ERROR and show it to the user (#bnc555204)
by Stefan Schubert 24 Nov '09

24 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit 61671be0674cc61c28f51bddb47aebb55c6d1052 Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Nov 24 16:10:02 2009 +0100 catch exception COLLECTD_SYNC_ERROR and show it to the user (#bnc555204) --- .../status/app/controllers/status_controller.rb | 22 ++++++++++++++----- .../app/views/status/_status_summary.html.erb | 19 ++++++---------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/plugins/status/app/controllers/status_controller.rb b/plugins/status/app/controllers/status_controller.rb index 1202af1..887479d 100644 --- a/plugins/status/app/controllers/status_controller.rb +++ b/plugins/status/app/controllers/status_controller.rb @@ -165,7 +165,9 @@ class StatusController < ApplicationController error_hash = Hash.from_xml error.response.body logger.warn error_hash.inspect if error_hash["error"] && - (error_hash["error"]["type"] == "SERVICE_NOT_RUNNING" || error_hash["error"]["type"] == "NO_PERM") + (error_hash["error"]["type"] == "SERVICE_NOT_RUNNING" || + error_hash["error"]["type"] == "COLLECTD_SYNC_ERROR" || + error_hash["error"]["type"] == "NO_PERM") flash[:error] = error_hash["error"]["description"] else raise error @@ -176,25 +178,33 @@ class StatusController < ApplicationController def show_summary return unless client_permissions begin + level = "ok" if create_data status = limits_reached status = (_("Limits exceeded for %s") % status) unless status.empty? + level = "error" else status = _("No data found for showing system status.") + level = "warning" end - render :partial => "status_summary", :locals => { :status => status, :error => nil } + render :partial => "status_summary", :locals => { :status => status, :level => level, :error => nil } rescue ActiveResource::ClientError => error logger.warn error.inspect - render :partial => "status_summary", :locals => { :status => nil, :error => ClientException.new(error) } and return + level = "error" + render :partial => "status_summary", :locals => { :status => nil, :level => "error", :error => ClientException.new(error) } and return rescue ActiveResource::ServerError => error error_hash = Hash.from_xml error.response.body + level = "error" logger.warn error_hash.inspect if error_hash["error"] && - (error_hash["error"]["type"] == "SERVICE_NOT_RUNNING" || error_hash["error"]["type"] == "NO_PERM") + (error_hash["error"]["type"] == "SERVICE_NOT_RUNNING" || + error_hash["error"]["type"] == "NO_PERM" || + error_hash["error"]["type"] == "COLLECTD_SYNC_ERROR") + level = "warning" if error_hash["error"]["type"] == "COLLECTD_SYNC_ERROR" #it is a warning only status = error_hash["error"]["description"] - render :partial => "status_summary", :locals => { :status => status, :error => nil } + render :partial => "status_summary", :locals => { :status => status, :level => level, :error => nil } else - render :partial => "status_summary", :locals => { :status => nil, :error => ClientException.new(error) } + render :partial => "status_summary", :locals => { :status => nil, :level => level, :error => ClientException.new(error) } end end end diff --git a/plugins/status/app/views/status/_status_summary.html.erb b/plugins/status/app/views/status/_status_summary.html.erb index 3950e6e..7f75da8 100644 --- a/plugins/status/app/views/status/_status_summary.html.erb +++ b/plugins/status/app/views/status/_status_summary.html.erb @@ -1,18 +1,13 @@ <%= report_error(error, _("An problem occured when loading status information.")) if error %> <div class="status_status"> - <% unless status %> - <div class="status-icon warning"></div> - <span><%= _("No status information available") %></span> - <% else %> - <% link_to "status" do %> - <% if !status.blank? %> - <div class="status-icon error"></div> - <span><%= status %></span> - <% else %> - <div class="status-icon ok"></div> - <span><%= _("Your system is healthy.") %></span> - <% end %> + <% link_to "status" do %> + <% if !status.blank? %> + <div class="status-icon <%= level %>"></div> + <span><%= status %></span> + <% else %> + <div class="status-icon ok"></div> + <span><%= _("Your system is healthy.") %></span> <% end %> <% end %> </div> -- 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] <rest-service> master : raising an exception if collectd is out of sync with the systemtime (#bnc555204)
by Stefan Schubert 24 Nov '09

24 Nov '09

ref: refs/heads/master commit 787d7728db6b9eae9ba30cee04d944e0ed664ecb Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Nov 24 16:07:38 2009 +0100 raising an exception if collectd is out of sync with the systemtime (#bnc555204) --- .../status/package/yast2-webservice-status.changes | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/plugins/status/package/yast2-webservice-status.changes b/plugins/status/package/yast2-webservice-status.changes index 8cc2e13..98c318a 100644 --- a/plugins/status/package/yast2-webservice-status.changes +++ b/plugins/status/package/yast2-webservice-status.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Nov 24 16:07:14 CET 2009 - schubi(a)suse.de + +- raising an exception if collectd is out of sync with the systemtime (#bnc555204) + +------------------------------------------------------------------- Wed Nov 18 14:54:36 CET 2009 - bbrunner(a)suse.de - collectd saves datas to /var/lib/collectd/WebYaST static; (bnc#555204) -- 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] <rest-service> master : raising an exception if collectd is out of sync with the systemtime (#bnc555204)
by Stefan Schubert 24 Nov '09

24 Nov '09

ref: refs/heads/master commit f4c8d62f92b58fc8061ac21f6200202c47962fb7 Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Nov 24 16:06:55 2009 +0100 raising an exception if collectd is out of sync with the systemtime (#bnc555204) --- plugins/status/lib/status.rb | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index 920989b..07a52f8 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -1,4 +1,24 @@ require 'exceptions' + +class CollectdOutOfSyncError < BackendException + def initialize(timestamp) + @timestamp = timestamp + super("Collectd is out of sync.") + end + + def to_xml + xml = Builder::XmlMarkup.new({}) + xml.instruct! + + xml.error do + xml.type "COLLECTD_SYNC_ERROR" + xml.description "Collectd is out of sync. Status information can be expected at #{Time.at((a)timestamp.to_i).inspect}." + xml.timestamp @timestamp + end + end +end + + # # Wrapper over collectd # @@ -58,7 +78,7 @@ class Status @collectd_running = check_collectd raise ServiceNotRunning.new('collectd') unless @collectd_running - + #find the correct plugin path for the config file plugin_config_dir = "#{RAILS_ROOT}/config" #default Rails.configuration.plugin_paths.each do |plugin_path| @@ -182,6 +202,12 @@ class Status # runs the rddtool on file with start time and end time # default last 5 minutes from now def run_rrdtool(file, start, stop) + + #checking if systemtime is BEHIND the last entry of collectd. + #If yes, no data will be available. + timestamp = `/bin/sh -c "LC_ALL=C rrdtool last #{file}"` + raise CollectdOutOfSyncError.new(timestamp) if Time.now < Time.at(timestamp.to_i) + stop = Time.now if stop.nil? # fetch last 5 minutes start = stop - 300 if start.nil? -- 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] <rest-service> master : enhance eula configuration documentation, store example in separate file
by Martin Kudlvasr 24 Nov '09

24 Nov '09

ref: refs/heads/master commit bc8347dc04d4c27b17e961731c91b47ec6d51bcb Author: Martin Kudlvasr <mkudlvasr(a)suse.cz> Date: Tue Nov 24 15:55:37 2009 +0100 enhance eula configuration documentation, store example in separate file --- plugins/eulas/doc/README_FOR_APP | 101 ++++++++++++++++++++++++---------- plugins/eulas/doc/eulas_example.yml | 3 + 2 files changed, 74 insertions(+), 30 deletions(-) diff --git a/plugins/eulas/doc/README_FOR_APP b/plugins/eulas/doc/README_FOR_APP index f0fff21..0222b49 100644 --- a/plugins/eulas/doc/README_FOR_APP +++ b/plugins/eulas/doc/README_FOR_APP @@ -1,41 +1,82 @@ -Eula -==== +EULAs +===== -Plugin cares for licenses and serves them to web-client on demand. -It handles locale, order of the licenses, checks and sets whether licenses -were accepted. + With the help of the WebYaST eulas module, users are presented with one or more end + user licence agreements (EULAs) during the base system setup. -Eula plugin package comes pre-configured with license for the distribution, -which the package is built for. +Configuration of EULAs +====================== -Add vendor specific license -=========================== + The list of EULAs to be used, in the order they are presented during the base system + setup, is defined in the /etc/webyast/eulas.yml configuration file. + + Configuration file is started with the initial line: - - Store your license text into the directory: - /usr/share/yastws/eulas/licenses/YOUR_LICENSE_NAME/license.txt - - Add YOUR_LICENSE_NAME into /etc/webyast/eulas.yml configuration file. + licenses: - Optional - -------- + Then follows the list of EULAs ordered as they should appear during the base system + setup follows. The format of eache line is: - - Store your license translations the same directory as license.txt and name - them like license.LANGUAGE_CODE.txt . - - Your license can only be shown to the user (instead of explicitely making - him accept it). If you want to choose this behaviour, create an empty file - named "no-acceptance-needed" in the same directory as license.txt. - - Example of eulas.yml - -------------------- + - EULA_name - licenses: - - SLE-11 - - YOUR_LICENSE_NAME + Where EULA_name is the name of the directory containing text of the EULA. The full + path to this directory is: -Accept license by hand -====================== + /usr/share/yastws/eulas/licenses/EULA_name/ + + The EULA_name directory contains plain text files with the text of the EULA. Text + files should be named using the license.locale.txt format. If the file with an + appropriate locale is not found, license.txt is used as a fallback. + + Minimum EULA configuration + -------------------------- + + Configuration with no EULAs is possible. When the file /etc/webyast/eulas.yml is + missing (or if it contains only the initial line), no licenses will be displayed. + + Minimum single EULA configuration + ------------------------- + + Single license configuration MUST contain english text of the license stored in: + + /usr/share/yastws/eulas/licenses/EULA_name/license.txt + + and /etc/webyast/eulas.yml configuration file: + + licenses: + - EULA_name + + Optional features + ----------------- + + If the file: + + /usr/share/yastws/eulas/licenses/EULA_name/no-acceptance-needed + + exists, there will be no Accept/Reject options displayed in the UI. After clicking + Next, the license will be considered accepted. + + Translations + ------------ + + All files in /usr/share/yastws/eulas/licenses/EULA_name/ with the name + license.locale.txt are considered license translation files with 'locale' being + the language identification string. No other configuration of the translations + is needed. + + Accept license by hand + ---------------------- + + Sometimes, accepting the license from command line on the target appliance + is useful. Entering these commands: + + touch /var/lib/yastws/eulas/accepted-licenses/EULA_name + chown yastws /var/lib/yastws/eulas/accepted-licenses/EULA_name + + has the same effect as accepting the license via the UI. + + Example eulas.yml File: -To accept a license without using the UI or webservice API, create an empty file - in the directory: /var/lib/yastws/eulas/accepted-licenses/LICENSE_NAME. Where -LICENSE_NAME is a license name identical to the one in /etc/webservice/eulas.yml . + eulas_example.yml Copyright (c) 2009 Novell, released under the GPL2 license diff --git a/plugins/eulas/doc/eulas_example.yml b/plugins/eulas/doc/eulas_example.yml new file mode 100644 index 0000000..fc6b5d4 --- /dev/null +++ b/plugins/eulas/doc/eulas_example.yml @@ -0,0 +1,3 @@ +licenses: + - SLES-11 + - APPLIANCE -- 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] r59737 - in /trunk/packager: package/yast2-packager.changes src/clients/pkg_finish.ycp
by locilka＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: locilka Date: Tue Nov 24 15:34:51 2009 New Revision: 59737 URL: http://svn.opensuse.org/viewcvs/yast?rev=59737&view=rev Log: - Creating backup of old repositories at the end of initial installation/upgrade before any other SourceSaveAll call (bnc #556469). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/pkg_finish.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Nov 24 15:34:51 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 24 15:32:33 CET 2009 - locilka(a)suse.cz + +- Creating backup of old repositories at the end of initial + installation/upgrade before any other SourceSaveAll call + (bnc #556469). + +------------------------------------------------------------------- Mon Nov 23 15:15:44 CET 2009 - kmachalkova(a)suse.cz - Webpin: Remaining string marked for translation (bnc#549945) Modified: trunk/packager/src/clients/pkg_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/pkg_finish.… ============================================================================== --- trunk/packager/src/clients/pkg_finish.ycp (original) +++ trunk/packager/src/clients/pkg_finish.ycp Tue Nov 24 15:34:51 2009 @@ -127,6 +127,12 @@ } */ + // Remove (backup) all sources not used during the update + // BNC #556469: Backup and remove all the old repositories before any Pkg::SourceSaveAll call + if (Stage::initial() && Mode::update()) { + BackUpAllTargetSources(); + } + // See bnc #384827, #381360 if (Mode::update()) { y2milestone ("Adding default repositories"); @@ -135,11 +141,6 @@ Pkg::SourceCacheCopyTo (Installation::destdir); - // Remove (backup) all sources not used during the update - if (Stage::initial() && Mode::update()) { - BackUpAllTargetSources(); - } - // save all repositories and finish target Pkg::SourceSaveAll (); Pkg::TargetFinish(); -- 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] r59736 - in /branches/SuSE-Code-11-SP1-Branch/packager: package/yast2-packager.changes src/clients/pkg_finish.ycp
by locilka＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: locilka Date: Tue Nov 24 15:34:44 2009 New Revision: 59736 URL: http://svn.opensuse.org/viewcvs/yast?rev=59736&view=rev Log: - Creating backup of old repositories at the end of initial installation/upgrade before any other SourceSaveAll call (bnc #556469). Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/clients/pkg_finish.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Tue Nov 24 15:34:44 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 24 15:32:33 CET 2009 - locilka(a)suse.cz + +- Creating backup of old repositories at the end of initial + installation/upgrade before any other SourceSaveAll call + (bnc #556469). + +------------------------------------------------------------------- Thu Nov 19 16:51:55 CET 2009 - locilka(a)suse.cz - REGISTERPRODUCT from content file moved to control file to Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/clients/pkg_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/clients/pkg_finish.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/clients/pkg_finish.ycp Tue Nov 24 15:34:44 2009 @@ -127,6 +127,12 @@ } */ + // Remove (backup) all sources not used during the update + // BNC #556469: Backup and remove all the old repositories before any Pkg::SourceSaveAll call + if (Stage::initial() && Mode::update()) { + BackUpAllTargetSources(); + } + // See bnc #384827, #381360 if (Mode::update()) { y2milestone ("Adding default repositories"); @@ -135,11 +141,6 @@ Pkg::SourceCacheCopyTo (Installation::destdir); - // Remove (backup) all sources not used during the update - if (Stage::initial() && Mode::update()) { - BackUpAllTargetSources(); - } - // save all repositories and finish target Pkg::SourceSaveAll (); Pkg::TargetFinish(); -- 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] r59735 - in /trunk/theme: SLE/icons/16x16/apps/ SLE/icons/22x22/apps/ SLE/icons/32x32/apps/ SLE/icons/48x48/apps/ SLE/icons/64x64/apps/ openSUSE/icons/16x16/apps/ openSUSE/icons/22x22/apps/ openSUS...
by jimmacfx＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: jimmacfx Date: Tue Nov 24 14:55:08 2009 New Revision: 59735 URL: http://svn.opensuse.org/viewcvs/yast?rev=59735&view=rev Log: Revert the yast launcher icon to a wrench which is a better metaphor. Embracing a yast brand at the cost of apprehension. http://www.mail-archive.com/yast-devel@opensuse.org/msg01518.html bnc#501452, bnc#544921 Added: trunk/theme/SLE/icons/16x16/apps/yast-mascot.png trunk/theme/SLE/icons/22x22/apps/yast-mascot.png trunk/theme/SLE/icons/32x32/apps/yast-mascot.png trunk/theme/SLE/icons/48x48/apps/yast-mascot.png trunk/theme/SLE/icons/64x64/apps/yast-mascot.png trunk/theme/openSUSE/icons/16x16/apps/yast-mascot.png trunk/theme/openSUSE/icons/22x22/apps/yast-mascot.png trunk/theme/openSUSE/icons/32x32/apps/yast-mascot.png trunk/theme/openSUSE/icons/48x48/apps/yast-mascot.png trunk/theme/openSUSE/icons/64x64/apps/yast-mascot.png Modified: trunk/theme/package/yast2-theme.changes Added: trunk/theme/SLE/icons/16x16/apps/yast-mascot.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/16x16/apps/yast-… ============================================================================== Files trunk/theme/SLE/icons/16x16/apps/yast-mascot.png (added) and trunk/theme/SLE/icons/16x16/apps/yast-mascot.png Tue Nov 24 14:55:08 2009 differ Added: trunk/theme/SLE/icons/22x22/apps/yast-mascot.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/22x22/apps/yast-… ============================================================================== Files trunk/theme/SLE/icons/22x22/apps/yast-mascot.png (added) and trunk/theme/SLE/icons/22x22/apps/yast-mascot.png Tue Nov 24 14:55:08 2009 differ Added: trunk/theme/SLE/icons/32x32/apps/yast-mascot.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/32x32/apps/yast-… ============================================================================== Files trunk/theme/SLE/icons/32x32/apps/yast-mascot.png (added) and trunk/theme/SLE/icons/32x32/apps/yast-mascot.png Tue Nov 24 14:55:08 2009 differ Added: trunk/theme/SLE/icons/48x48/apps/yast-mascot.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/48x48/apps/yast-… ============================================================================== Files trunk/theme/SLE/icons/48x48/apps/yast-mascot.png (added) and trunk/theme/SLE/icons/48x48/apps/yast-mascot.png Tue Nov 24 14:55:08 2009 differ Added: trunk/theme/SLE/icons/64x64/apps/yast-mascot.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/64x64/apps/yast-… ============================================================================== Files trunk/theme/SLE/icons/64x64/apps/yast-mascot.png (added) and trunk/theme/SLE/icons/64x64/apps/yast-mascot.png Tue Nov 24 14:55:08 2009 differ Added: trunk/theme/openSUSE/icons/16x16/apps/yast-mascot.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/16x16/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/16x16/apps/yast-mascot.png (added) and trunk/theme/openSUSE/icons/16x16/apps/yast-mascot.png Tue Nov 24 14:55:08 2009 differ Added: trunk/theme/openSUSE/icons/22x22/apps/yast-mascot.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/22x22/apps/yast-mascot.png (added) and trunk/theme/openSUSE/icons/22x22/apps/yast-mascot.png Tue Nov 24 14:55:08 2009 differ Added: trunk/theme/openSUSE/icons/32x32/apps/yast-mascot.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/32x32/apps/yast-mascot.png (added) and trunk/theme/openSUSE/icons/32x32/apps/yast-mascot.png Tue Nov 24 14:55:08 2009 differ Added: trunk/theme/openSUSE/icons/48x48/apps/yast-mascot.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/48x48/apps/yast-mascot.png (added) and trunk/theme/openSUSE/icons/48x48/apps/yast-mascot.png Tue Nov 24 14:55:08 2009 differ Added: trunk/theme/openSUSE/icons/64x64/apps/yast-mascot.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/64x64/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/64x64/apps/yast-mascot.png (added) and trunk/theme/openSUSE/icons/64x64/apps/yast-mascot.png Tue Nov 24 14:55:08 2009 differ Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Tue Nov 24 14:55:08 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Nov 24 14:52:37 CET 2009 - jimmac(a)novell.com + +- use wrench for the launcher icon again. In all sizes. The arrdvark mascot added as yast-mascot. bnc#501452, bnc#544921 + +------------------------------------------------------------------- Wed Nov 4 14:49:33 CET 2009 - jimmac(a)novell.com - fix margin for the sidebar headers. bnc#547641 -- 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] r59734 - /trunk/theme/SLE/icons/16x16/apps/yast-files.png
by jimmacfx＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: jimmacfx Date: Tue Nov 24 14:55:01 2009 New Revision: 59734 URL: http://svn.opensuse.org/viewcvs/yast?rev=59734&view=rev Log: missing size Added: trunk/theme/SLE/icons/16x16/apps/yast-files.png Added: trunk/theme/SLE/icons/16x16/apps/yast-files.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/16x16/apps/yast-… ============================================================================== Files trunk/theme/SLE/icons/16x16/apps/yast-files.png (added) and trunk/theme/SLE/icons/16x16/apps/yast-files.png Tue Nov 24 14:55:01 2009 differ -- 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] r59733 - /trunk/autoinstallation/src/modules/AutoInstallRules.ycp
by ug＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: ug Date: Tue Nov 24 14:42:38 2009 New Revision: 59733 URL: http://svn.opensuse.org/viewcvs/yast?rev=59733&view=rev Log: fix for locked rules in dialogs Modified: trunk/autoinstallation/src/modules/AutoInstallRules.ycp Modified: trunk/autoinstallation/src/modules/AutoInstallRules.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoInstallRules.ycp (original) +++ trunk/autoinstallation/src/modules/AutoInstallRules.ycp Tue Nov 24 14:42:38 2009 @@ -624,7 +624,9 @@ map<integer,integer> conflictsCounter = $[]; foreach ( map<string, map> rule, rulelist, ``{ if( haskey( rule, "dialog" ) ) { - string file = rule["result","profile"]:""; + element_nr = rule["dialog","element"]:element_nr; + string file = element2file[element_nr]:""; + element_nr = element_nr + 1; if( contains(tomerge, file) ) { foreach( integer c, rule["dialog","conflicts"]:[], ``{ conflictsCounter[c] = conflictsCounter[c]:0 + 1; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0