December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <rest-service> backgroud_patches_bnc550934 : subprogress: use -1 instead of nil as the default value
by Ladislav Slezak 16 Dec '09

16 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit ace5ef638ad5cc114a916e8b0aa5bfecbc1b6af9 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Dec 16 15:21:35 2009 +0100 subprogress: use -1 instead of nil as the default value nil.to_i => 0, after deserialization from XML it was not possible to distinguish between 0% and no subprogress --- webservice/lib/background_status.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/webservice/lib/background_status.rb b/webservice/lib/background_status.rb index b7f7127..03ea420 100644 --- a/webservice/lib/background_status.rb +++ b/webservice/lib/background_status.rb @@ -6,7 +6,7 @@ class BackgroundStatus :progress, :subprogress - def initialize(stat = 'unknown', progress = 0, subprogress = nil, &block) + def initialize(stat = 'unknown', progress = 0, subprogress = -1, &block) @status = stat @progress = progress @subprogress = subprogress -- 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 : serialize only values which is not nil (to determine difference between empty value and nil value)
by Josef Reidinger 16 Dec '09

16 Dec '09

ref: refs/heads/master commit d7761e7f9931cba8267c3f77406337ec6a5d7c86 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Wed Dec 16 15:05:47 2009 +0100 serialize only values which is not nil (to determine difference between empty value and nil value) --- .../lib/base_model/serializers/json_serializer.rb | 3 ++- .../lib/base_model/serializers/xml_serializer.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/webservice/lib/base_model/serializers/json_serializer.rb b/webservice/lib/base_model/serializers/json_serializer.rb index ad984f0..e41fa0a 100644 --- a/webservice/lib/base_model/serializers/json_serializer.rb +++ b/webservice/lib/base_model/serializers/json_serializer.rb @@ -17,7 +17,8 @@ private def as_json(options={}) hash = {} Serializer.new(self,options).attributes.each do |attr| - hash[attr.to_s[1..-1]] = instance_variable_get(attr) + val = instance_variable_get(attr) + hash[attr.to_s[1..-1]] = val unless val.nil? #remove nil values end hash = { self.class.model_name.singular => hash } hash diff --git a/webservice/lib/base_model/serializers/xml_serializer.rb b/webservice/lib/base_model/serializers/xml_serializer.rb index e8289a6..e3317a2 100644 --- a/webservice/lib/base_model/serializers/xml_serializer.rb +++ b/webservice/lib/base_model/serializers/xml_serializer.rb @@ -24,7 +24,7 @@ module BaseModel @attributes.each do |attr| value = @model.instance_variable_get(attr) name = attr.to_s[1..-1] - serialize_value(name,value,builder) + serialize_value(name,value,builder) unless value.nil? end } end -- 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 : use alias_method instead of alias for better error handling and more ruby like style instead of built-in alias
by Josef Reidinger 16 Dec '09

16 Dec '09

ref: refs/heads/master commit f1b34295ec11570903b6ff0ad65adcde216fe5b1 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Wed Dec 16 14:03:16 2009 +0100 use alias_method instead of alias for better error handling and more ruby like style instead of built-in alias --- webservice/lib/base_model/base.rb | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webservice/lib/base_model/base.rb b/webservice/lib/base_model/base.rb index 75ed3a7..39d76c9 100644 --- a/webservice/lib/base_model/base.rb +++ b/webservice/lib/base_model/base.rb @@ -111,12 +111,12 @@ module BaseModel end #remove overwritten method_missing from activeRecord (as Base model doesn't know attributes) - alias :method_missing_orig :method_missing + alias_method :method_missing_orig, :method_missing #required by validations include ActiveRecord::AttributeMethods - alias :method_missing :method_missing_orig + alias_method :method_missing, :method_missing_orig #remove overwritten respond_to (as Base model doesn't have attributes - alias :respond_to? :respond_to_without_attributes? + alias_method :respond_to?, :respond_to_without_attributes? #Validations in model include ActiveRecord::Validations -- 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] r60122 - /trunk/storage/storage/src/modules/Partitions.ycp
by aschnell＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: aschnell Date: Wed Dec 16 13:58:52 2009 New Revision: 60122 URL: http://svn.opensuse.org/viewcvs/yast?rev=60122&view=rev Log: - read meminfo normally in testmode Modified: trunk/storage/storage/src/modules/Partitions.ycp Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Wed Dec 16 13:58:52 2009 @@ -334,20 +334,14 @@ return( !IsDosWinNtPartition( fsid ) && fsid==fsid_swap ); } -global define integer SwapSizeMb( integer slot_size ) - ``{ - integer swap_size = 0; +global integer SwapSizeMb( integer slot_size ) + { + map mem_info_map = (map) SCR::Read(.proc.meminfo); + integer mem = mem_info_map["memtotal"]:0 / 1024; + y2milestone("mem_info_map:%1 mem:%2", mem_info_map, mem); // a good approach swap == mem x 2 - integer mem = 256; - if( !Mode::test () ) - { - map mem_info_map = (map) SCR::Read(.proc.meminfo); - y2milestone( "mem_info_map %1", mem_info_map ); - mem = mem_info_map["memtotal"]:0; - mem = mem / 1024; - } - if( mem == 0 || mem == nil ) mem = 64; + integer swap_size = 0; if( slot_size==0 ) { @@ -424,7 +418,7 @@ y2milestone( "SwapSizeMb mem %1 slot_size %2 swap_size %3", mem, slot_size, swap_size ); return( swap_size ); - }; + } global define boolean IsResizable( integer fsid ) -- 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] r60121 - /tags/stable-2_19_0/online-update/
by jsuchome＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: jsuchome Date: Wed Dec 16 13:56:41 2009 New Revision: 60121 URL: http://svn.opensuse.org/viewcvs/yast?rev=60121&view=rev Log: Created tag stable-2_19_0 for online-update Added: tags/stable-2_19_0/online-update/ - copied from r60120, trunk/online-update/ -- 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] r60120 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/OnlineUpdate.ycp src/online_update.ycp src/online_update_select.ycp
by jsuchome＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: jsuchome Date: Wed Dec 16 13:56:16 2009 New Revision: 60120 URL: http://svn.opensuse.org/viewcvs/yast?rev=60120&view=rev Log: - better message for telling user to reboot, show list of patches that require a reboot (bnc#497217) - 2.19.0 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/OnlineUpdate.ycp trunk/online-update/src/online_update.ycp trunk/online-update/src/online_update_select.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=60120&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Wed Dec 16 13:56:16 2009 @@ -1 +1 @@ -2.18.5 +2.19.0 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Wed Dec 16 13:56:16 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Dec 16 13:22:57 CET 2009 - jsuchome(a)suse.cz + +- better message for telling user to reboot, show list of patches + that require a reboot (bnc#497217) +- 2.19.0 + +------------------------------------------------------------------- Thu Nov 26 07:49:16 UTC 2009 - lslezak(a)suse.cz - don't show "Continue" button when the software management is Modified: trunk/online-update/src/OnlineUpdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/OnlineUpdate.y… ============================================================================== --- trunk/online-update/src/OnlineUpdate.ycp (original) +++ trunk/online-update/src/OnlineUpdate.ycp Wed Dec 16 13:56:16 2009 @@ -35,9 +35,19 @@ // if patch with reboot flag was installed global boolean reboot_needed = false; +// packages that are requiring reboot +global list<string> reboot_packages = []; + // popup message global string reboot_message = _("At least one of the updates installed requires a system reboot to function -properly. Reboot the system."); +properly. Reboot the system as soon as possible."); + +// popup message +global string reboot_message_list = _("These updates require a system reboot to function properly: + +%1. + +Reboot the system as soon as possible."); // continue/cancel popup text global string more_selected_message = _("There are patches for package management available that require a restart of YaST. Modified: trunk/online-update/src/online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/online_update.… ============================================================================== --- trunk/online-update/src/online_update.ycp (original) +++ trunk/online-update/src/online_update.ycp Wed Dec 16 13:56:16 2009 @@ -233,7 +233,10 @@ } if (OnlineUpdate::reboot_needed) { - Popup::Message (OnlineUpdate::reboot_message); + if (size (OnlineUpdate::reboot_packages) > 0) + Popup::Message (sformat (OnlineUpdate::reboot_message_list, mergestring (OnlineUpdate::reboot_packages, "\n"))); + else + Popup::Message (OnlineUpdate::reboot_message); } else if (OnlineUpdate::relogin_needed) { Modified: trunk/online-update/src/online_update_select.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/online_update_… ============================================================================== --- trunk/online-update/src/online_update_select.ycp (original) +++ trunk/online-update/src/online_update_select.ycp Wed Dec 16 13:56:16 2009 @@ -54,6 +54,7 @@ boolean normal_patches_selected = false; integer selected = 0; string saved_path = Directory::vardir + "/selected_patches.ycp"; + list<string> reboot_packages = []; // check if YaST was restarted if (FileUtils::Exists (saved_path)) @@ -196,7 +197,11 @@ { y2milestone ("selected patch: %1", patch); if (patch["reboot_needed"]:false) + { reboot_needed = true; + reboot_packages = (list<string>) union ( + reboot_packages, [ patch["name"]:"" ]); + } if (patch["relogin_needed"]:false) relogin_needed = true; if (patch["affects_pkg_manager"]:false) @@ -237,6 +242,7 @@ } OnlineUpdate::restart_yast = restart_yast; OnlineUpdate::reboot_needed = reboot_needed; + OnlineUpdate::reboot_packages = reboot_packages; OnlineUpdate::relogin_needed = relogin_needed; if ( ret == `cancel ) return `abort; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60119 - /tags/branch-Code-11-SP1-2_17_20/online-update/
by jsuchome＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: jsuchome Date: Wed Dec 16 13:56:11 2009 New Revision: 60119 URL: http://svn.opensuse.org/viewcvs/yast?rev=60119&view=rev Log: Created tag branch-Code-11-SP1-2_17_20 for online-update Added: tags/branch-Code-11-SP1-2_17_20/online-update/ (props changed) - copied from r60118, branches/SuSE-Code-11-SP1-Branch/online-update/ -- 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] r60118 - /tags/branch-Code-11-SP1-2_17_20/
by jsuchome＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: jsuchome Date: Wed Dec 16 13:56:05 2009 New Revision: 60118 URL: http://svn.opensuse.org/viewcvs/yast?rev=60118&view=rev Log: Created tag branch-Code-11-SP1-2_17_20 Added: tags/branch-Code-11-SP1-2_17_20/ -- 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] r60117 - in /branches/SuSE-Code-11-SP1-Branch/online-update: VERSION package/yast2-online-update.changes src/OnlineUpdate.ycp src/online_update.ycp src/online_update_select.ycp
by jsuchome＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: jsuchome Date: Wed Dec 16 13:56:01 2009 New Revision: 60117 URL: http://svn.opensuse.org/viewcvs/yast?rev=60117&view=rev Log: - better message for telling user to reboot, show list of patches that require a reboot (bnc#497217) - 2.17.20 Modified: branches/SuSE-Code-11-SP1-Branch/online-update/VERSION branches/SuSE-Code-11-SP1-Branch/online-update/package/yast2-online-update.changes branches/SuSE-Code-11-SP1-Branch/online-update/src/OnlineUpdate.ycp branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update.ycp branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update_select.ycp Modified: branches/SuSE-Code-11-SP1-Branch/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/onlin… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/online-update/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/online-update/VERSION Wed Dec 16 13:56:01 2009 @@ -1 +1 @@ -2.17.19 +2.17.20 Modified: branches/SuSE-Code-11-SP1-Branch/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/onlin… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/online-update/package/yast2-online-update.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/online-update/package/yast2-online-update.changes Wed Dec 16 13:56:01 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Dec 16 13:24:49 CET 2009 - jsuchome(a)suse.cz + +- better message for telling user to reboot, show list of patches + that require a reboot (bnc#497217) +- 2.17.20 + +------------------------------------------------------------------- Tue Feb 17 16:25:04 CET 2009 - jsuchome(a)suse.cz - AutoYaST: call solver before preselecting patches (bnc#476460) Modified: branches/SuSE-Code-11-SP1-Branch/online-update/src/OnlineUpdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/onlin… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/online-update/src/OnlineUpdate.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/online-update/src/OnlineUpdate.ycp Wed Dec 16 13:56:01 2009 @@ -35,9 +35,19 @@ // if patch with reboot flag was installed global boolean reboot_needed = false; +// packages that are requiring reboot +global list<string> reboot_packages = []; + // popup message global string reboot_message = _("At least one of the updates installed requires a system reboot to function -properly. Reboot the system."); +properly. Reboot the system as soon as possible."); + +// popup message +global string reboot_message_list = _("These updates require a system reboot to function properly: + +%1. + +Reboot the system as soon as possible."); // continue/cancel popup text global string more_selected_message = _("There are patches for package management available that require a restart of YaST. Modified: branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/onlin… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update.ycp Wed Dec 16 13:56:01 2009 @@ -218,7 +218,10 @@ } if (OnlineUpdate::reboot_needed) { - Popup::Message (OnlineUpdate::reboot_message); + if (size (OnlineUpdate::reboot_packages) > 0) + Popup::Message (sformat (OnlineUpdate::reboot_message_list, mergestring (OnlineUpdate::reboot_packages, "\n"))); + else + Popup::Message (OnlineUpdate::reboot_message); } else if (OnlineUpdate::relogin_needed) { Modified: branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update_select.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/onlin… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update_select.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update_select.ycp Wed Dec 16 13:56:01 2009 @@ -54,6 +54,7 @@ boolean normal_patches_selected = false; integer selected = 0; string saved_path = Directory::vardir + "/selected_patches.ycp"; + list<string> reboot_packages = []; // check if YaST was restarted if (FileUtils::Exists (saved_path)) @@ -197,7 +198,11 @@ { y2milestone ("selected patch: %1", patch); if (patch["reboot_needed"]:false) + { reboot_needed = true; + reboot_packages = (list<string>) union ( + reboot_packages, [ patch["name"]:"" ]); + } if (patch["relogin_needed"]:false) relogin_needed = true; if (patch["affects_pkg_manager"]:false) @@ -238,6 +243,7 @@ } OnlineUpdate::restart_yast = restart_yast; OnlineUpdate::reboot_needed = reboot_needed; + OnlineUpdate::reboot_packages = reboot_packages; OnlineUpdate::relogin_needed = relogin_needed; if ( ret == `cancel ) return `abort; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60116 - in /trunk/storage/storage/src/testsuite/lib: helper1a.ycp helper1b.ycp
by aschnell＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: aschnell Date: Wed Dec 16 13:55:20 2009 New Revision: 60116 URL: http://svn.opensuse.org/viewcvs/yast?rev=60116&view=rev Log: - use testsuite module instead of include - simulate meminfo Modified: trunk/storage/storage/src/testsuite/lib/helper1a.ycp trunk/storage/storage/src/testsuite/lib/helper1b.ycp Modified: trunk/storage/storage/src/testsuite/lib/helper1a.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/li… ============================================================================== --- trunk/storage/storage/src/testsuite/lib/helper1a.ycp (original) +++ trunk/storage/storage/src/testsuite/lib/helper1a.ycp Wed Dec 16 13:55:20 2009 @@ -1,5 +1,5 @@ { - include "testsuite.ycp"; + import "Testsuite"; map READ = $[ "probe" : $[ @@ -8,7 +8,8 @@ "cdrom" : [] ], "proc" : $[ - "swaps" : [] + "swaps" : [], + "meminfo" : $[ "memtotal" : 256 * 1024 ] ], "sysconfig" : $[ "storage" : $[ @@ -30,7 +31,7 @@ ], ]; - TESTSUITE_INIT([READ, $[], READ], nil); + Testsuite::Init([READ, $[], READ], nil); import "Stage"; Modified: trunk/storage/storage/src/testsuite/lib/helper1b.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/li… ============================================================================== --- trunk/storage/storage/src/testsuite/lib/helper1b.ycp (original) +++ trunk/storage/storage/src/testsuite/lib/helper1b.ycp Wed Dec 16 13:55:20 2009 @@ -1,6 +1,4 @@ { - include "testsuite.ycp"; - import "Storage"; import "StorageProposal"; @@ -17,17 +15,17 @@ list<map> infos = Storage::GetCommitInfos(); - DUMP("Proposal:"); + Testsuite::Dump("Proposal:"); foreach(map info, infos, { string text = info[`text]:""; if (info[`destructive]:false) text = text + " [destructive]"; - DUMP(text); + Testsuite::Dump(text); }); } else { - DUMP("No proposal."); + Testsuite::Dump("No proposal."); } Storage::FinishLibstorage(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0