Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2014-06-18 10:59:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2014-06-02 07:00:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2014-06-18 10:59:47.000000000 +0200 @@ -1,0 +2,35 @@ +Tue Jun 17 12:56:20 CEST 2014 - [email protected] + +- Fixed error message for missing services + (bnc#882609) +- 3.1.79 + +------------------------------------------------------------------- +Wed Jun 11 10:02:27 UTC 2014 - [email protected] + +- bnc#878719 + - improved handling of inactive network service +- 3.1.78 + +------------------------------------------------------------------- +Tue Jun 10 16:31:19 UTC 2014 - [email protected] + +- make sure the total installation progress is always 100% + (adjust the rounding issues when computing the subprogress + percentages) (bnc#865585) +- 3.1.77 + +------------------------------------------------------------------- +Mon Jun 9 11:53:58 UTC 2014 - [email protected] + +- bnc#864619 + - stop wicked service(s) properly when switching network services +- 3.1.76 + +------------------------------------------------------------------- +Wed Jun 4 12:47:17 CEST 2014 - [email protected] + +- Adjusted textdomain for OSRelease library +- 3.1.75 + +------------------------------------------------------------------- Old: ---- yast2-3.1.74.tar.bz2 New: ---- yast2-3.1.79.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.A8Au6p/_old 2014-06-18 10:59:48.000000000 +0200 +++ /var/tmp/diff_new_pack.A8Au6p/_new 2014-06-18 10:59:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.74 +Version: 3.1.79 Release: 0 Url: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.74.tar.bz2 -> yast2-3.1.79.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.74/library/general/src/modules/OSRelease.rb new/yast2-3.1.79/library/general/src/modules/OSRelease.rb --- old/yast2-3.1.74/library/general/src/modules/OSRelease.rb 2014-05-30 13:12:46.000000000 +0200 +++ new/yast2-3.1.79/library/general/src/modules/OSRelease.rb 2014-06-17 16:47:52.000000000 +0200 @@ -41,6 +41,10 @@ class OSReleaseClass < Module include Yast::Logger + def initialize + textdomain "base" + end + OS_RELEASE_PATH = "/etc/os-release" # Get information about the OS release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.74/library/network/src/modules/NetworkService.rb new/yast2-3.1.79/library/network/src/modules/NetworkService.rb --- old/yast2-3.1.74/library/network/src/modules/NetworkService.rb 2014-05-30 13:12:46.000000000 +0200 +++ new/yast2-3.1.79/library/network/src/modules/NetworkService.rb 2014-06-17 16:47:52.000000000 +0200 @@ -76,7 +76,7 @@ include Yast::Logger def main - Yast.import "Service" + Yast.import "SystemdService" Yast.import "NetworkConfig" Yast.import "Popup" Yast.import "Mode" @@ -152,6 +152,12 @@ alias_method :is_wicked, :wicked? + def disabled? + cached_service?(nil) + end + + alias_method :is_disabled, :disabled? + def use_network_manager Read() @cached_name = :network_manager @@ -173,33 +179,30 @@ nil end + # disables network service completely + def disable + @cached_name = nil + stop_service(@current_name) + RunSystemCtl( BACKENDS[ @current_name], "disable") + + Read() + end + # Initialize module data def Read - if !@initialized - case Service.GetServiceId("network") - when "network" - @current_name = :netconfig - when "NetworkManager" - @current_name = :network_manager - when "wicked" - @current_name = :wicked - else - if Stage.initial - @current_name = DEFAULT_BACKEND - log.info "Running in installer, use default: #{@current_name}" - elsif Mode.config - @current_name = DEFAULT_BACKEND - log.info "Running in AutoYast config, use default: #{@current_name}" - else - log.info "Cannot determine used network service." - raise "Cannot detect used network service" - end - end + return if @initialized - @cached_name = @current_name - - log.info "Current backend: #{@current_name}" + if Stage.initial + @current_name = DEFAULT_BACKEND + log.info "Running in installer/AutoYaST, use default: #{@current_name}" + else + service = SystemdService.find("network") + @current_name = BACKENDS.invert[service.name] if service end + + @cached_name = @current_name + + log.info "Current backend: #{@current_name}" @initialized = true nil @@ -219,30 +222,25 @@ # Helper to apply a change of the network service def EnableDisableNow - if Modified() - # Stop should be called before, but when the service - # were not correctly started until now, stop may have - # no effect. - # So let's kill all processes in the network service - # cgroup to make sure e.g. dhcp clients are stopped. - @initialized = false - RunSystemCtl( BACKENDS[ @current_name], "kill") + return if !Modified() - case @cached_name - when :network_manager, :wicked - RunSystemCtl( BACKENDS[ @cached_name], "--force enable") - when :netconfig - RunSystemCtl( BACKENDS[ @current_name], "disable") - - # Workaround for bug #61055: - Builtins.y2milestone("Enabling service %1", "network") - cmd = "cd /; /sbin/insserv -d /etc/init.d/network" - SCR.Execute(path(".target.bash"), cmd) - end + stop_service(@current_name) - Read() + case @cached_name + when :network_manager, :wicked + RunSystemCtl( BACKENDS[ @cached_name], "--force enable") + when :netconfig + RunSystemCtl( BACKENDS[ @current_name], "disable") + + # Workaround for bug #61055: + Builtins.y2milestone("Enabling service %1", "network") + cmd = "cd /; /sbin/insserv -d /etc/init.d/network" + SCR.Execute(path(".target.bash"), cmd) end + @initialized = false + Read() + nil end @@ -436,12 +434,34 @@ nil end + # Stops backend network service + def stop_service(service) + return if !service + + if service == :wicked + # FIXME: + # you really need to use 'wickedd'. Moreover kill action do not + # kill all wickedd services - e.g. nanny, dhcp* ... stays running + # This needs to be clarified with wicked people. + # bnc#864619 + RunSystemCtl("wickedd", "stop") + else + # Stop should be called before, but when the service + # were not correctly started until now, stop may have + # no effect. + # So let's kill all processes in the network service + # cgroup to make sure e.g. dhcp clients are stopped. + RunSystemCtl(BACKENDS[ @current_name], "kill") + end + end + publish :function => :Read, :type => "void ()" publish :function => :Modified, :type => "boolean ()" publish :function => :is_backend_available, :type => "boolean (symbol)" publish :function => :is_network_manager, :type => "boolean ()" publish :function => :is_netconfig, :type => "boolean ()" publish :function => :is_wicked, :type => "boolean ()" + publish :function => :is_disabled, :type => "boolean ()" publish :function => :use_network_manager, :type => "void ()" publish :function => :use_netconfig, :type => "void ()" publish :function => :use_wicked, :type => "void ()" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.74/library/network/src/modules/SuSEFirewallServices.rb new/yast2-3.1.79/library/network/src/modules/SuSEFirewallServices.rb --- old/yast2-3.1.74/library/network/src/modules/SuSEFirewallServices.rb 2014-05-30 13:12:46.000000000 +0200 +++ new/yast2-3.1.79/library/network/src/modules/SuSEFirewallServices.rb 2014-06-17 16:47:52.000000000 +0200 @@ -614,7 +614,7 @@ log.error "Service #{service} is unknown" raise( SuSEFirewalServiceNotFound, - _("Service with name '%{service_name}' does not exist") % { :service_name => service_name } + _("Service with name '%{service_name}' does not exist") % { :service_name => service } ) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.74/library/packages/src/modules/SlideShow.rb new/yast2-3.1.79/library/packages/src/modules/SlideShow.rb --- old/yast2-3.1.74/library/packages/src/modules/SlideShow.rb 2014-05-30 13:12:46.000000000 +0200 +++ new/yast2-3.1.79/library/packages/src/modules/SlideShow.rb 2014-06-17 16:47:53.000000000 +0200 @@ -601,7 +601,7 @@ if UI.WidgetExists(:tabContents) UI.ChangeWidget(:dumbTab, :CurrentItem, :showSlide) - UI.ReplaceWidget(:tabContents, SlidePageWidgets()) + UI.ReplaceWidget(:tabContents, SlidePageWidgets()) # UpdateTotalProgress(false); // FIXME: this breaks other stages! end @@ -642,7 +642,7 @@ if UI.WidgetExists(:tabContents) UI.ChangeWidget(:dumbTab, :CurrentItem, id) - UI.ReplaceWidget(:tabContents, RelNotesPageWidgets(id)) + UI.ReplaceWidget(:tabContents, RelNotesPageWidgets(id)) # UpdateTotalProgress(false); end @@ -820,7 +820,7 @@ elsif button == :debugHotkey @debug = !@debug Builtins.y2milestone("Debug mode: %1", @debug) - end + end # note: `abort is handled in SlideShowCallbacks::HandleInput() nil @@ -944,6 +944,7 @@ # ] def Setup(stages) stages = deep_copy(stages) + log.info "SlideShow stages: #{stages}" # initiliaze the generic counters Reset() @@ -971,6 +972,7 @@ @_stages = {} # prepare a new stages description + total_size = 0 # distribute the total time to stages as per cents Builtins.foreach(stages) do |stage| if Ops.get_symbol(stage, "units", :sec) == :sec @@ -1008,11 +1010,30 @@ start = Ops.add(start, Ops.get_integer(stage, "size", 0)) end + total_size += stage["size"] Ops.set(@_stages, Ops.get_string(stage, "name", ""), stage) # setup first stage @_current_stage = deep_copy(stage) if @_current_stage == nil end + # Because of using integers in the calculation above the sum of the sizes + # might not be 100% due to rounding. Update the last stage so the + # total installation progress is 100%. + if total_size != 100 + log.info "Total global progress: #{total_size}%, adjusting to 100%..." + + # find the last stage and adjust it + updated_stage_name = stages.last["name"] + updated_stage = @_stages[updated_stage_name] + + new_size = 100 - total_size + updated_stage["size"] + log.info "Updating '#{updated_stage_name}' stage size from " \ + "#{updated_stage["size"]}% to #{new_size}%" + + updated_stage["size"] = new_size + @_stages[updated_stage_name] = updated_stage + end + Builtins.y2milestone("Global progress bar: %1", @_stages) nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.74/library/packages/test/slide_show_test.rb new/yast2-3.1.79/library/packages/test/slide_show_test.rb --- old/yast2-3.1.74/library/packages/test/slide_show_test.rb 2014-05-30 13:12:46.000000000 +0200 +++ new/yast2-3.1.79/library/packages/test/slide_show_test.rb 2014-06-17 16:47:53.000000000 +0200 @@ -136,4 +136,20 @@ end end + describe "#Setup" do + it "the total progress is adjusted to exact 100%" do + # input data from minimal SLES installation + stages = [ + {"name"=>"disk", "description"=>"Preparing disks...", "value"=>120, "units"=>:sec}, + {"name"=>"images", "description"=>"Deploying Images...", "value"=>0, "units"=>:kb}, + {"name"=>"packages", "description"=>"Installing Packages...", "value"=>1348246, "units"=>:kb}, + {"name"=>"finish", "description"=>"Finishing Basic Installation", "value"=>100, "units"=>:sec} + ] + + Yast::SlideShow.Setup(stages) + total_size = Yast::SlideShow.GetSetup.values.reduce(0){|sum, stage| sum += stage["size"]} + expect(total_size).to eq(100) + end + end + end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.74/package/yast2.changes new/yast2-3.1.79/package/yast2.changes --- old/yast2-3.1.74/package/yast2.changes 2014-05-30 13:12:46.000000000 +0200 +++ new/yast2-3.1.79/package/yast2.changes 2014-06-17 16:47:53.000000000 +0200 @@ -1,4 +1,39 @@ ------------------------------------------------------------------- +Tue Jun 17 12:56:20 CEST 2014 - [email protected] + +- Fixed error message for missing services + (bnc#882609) +- 3.1.79 + +------------------------------------------------------------------- +Wed Jun 11 10:02:27 UTC 2014 - [email protected] + +- bnc#878719 + - improved handling of inactive network service +- 3.1.78 + +------------------------------------------------------------------- +Tue Jun 10 16:31:19 UTC 2014 - [email protected] + +- make sure the total installation progress is always 100% + (adjust the rounding issues when computing the subprogress + percentages) (bnc#865585) +- 3.1.77 + +------------------------------------------------------------------- +Mon Jun 9 11:53:58 UTC 2014 - [email protected] + +- bnc#864619 + - stop wicked service(s) properly when switching network services +- 3.1.76 + +------------------------------------------------------------------- +Wed Jun 4 12:47:17 CEST 2014 - [email protected] + +- Adjusted textdomain for OSRelease library +- 3.1.75 + +------------------------------------------------------------------- Fri May 30 11:06:47 UTC 2014 - [email protected] - Add Service.call method to make available all systemctl commands diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.74/package/yast2.spec new/yast2-3.1.79/package/yast2.spec --- old/yast2-3.1.74/package/yast2.spec 2014-05-30 13:12:46.000000000 +0200 +++ new/yast2-3.1.79/package/yast2.spec 2014-06-17 16:47:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.74 +Version: 3.1.79 Release: 0 URL: https://github.com/yast/yast-yast2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
