Script 'mail_helper' called by bg Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: bg. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2 -> sle12 ## BNC# 878719 : ""Internal error" when all NetworkManager packages are uninstalled - SLES12" (RESOLVED/FIXED) ## BNC# 865585 : "99% done but installation has been finished" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2/yast2.changes 2014-06-10 10:02:34.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2/yast2.changes 2014-06-11 13:48:14.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Jun 11 10:02:27 UTC 2014 - mfilka@suse.com + +- bnc#878719 + - improved handling of inactive network service +- 3.1.78 + +------------------------------------------------------------------- +Tue Jun 10 16:31:19 UTC 2014 - lslezak@suse.cz + +- make sure the total installation progress is always 100% + (adjust the rounding issues when computing the subprogress + percentages) (bnc#865585) +- 3.1.77 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2 - at least 73 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2 (Old) and /mounts/work_src_done/SLE12/yast2 (BS:build ID:39300 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-3.1.76.tar.bz2 New: ---- yast2-3.1.78.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.PS9s18/_old 2014-06-11 15:26:49.000000000 +0200 +++ /var/tmp/diff_new_pack.PS9s18/_new 2014-06-11 15:26:49.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.76 +Version: 3.1.78 Release: 0 URL: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.76.tar.bz2 -> yast2-3.1.78.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.76/library/network/src/modules/NetworkService.rb new/yast2-3.1.78/library/network/src/modules/NetworkService.rb --- old/yast2-3.1.76/library/network/src/modules/NetworkService.rb 2014-06-09 14:31:33.000000000 +0200 +++ new/yast2-3.1.78/library/network/src/modules/NetworkService.rb 2014-06-11 13:41:20.000000000 +0200 @@ -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,6 +179,15 @@ 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 return if @initialized @@ -181,8 +196,8 @@ @current_name = DEFAULT_BACKEND log.info "Running in installer/AutoYaST, use default: #{@current_name}" else - name = SystemdService.find!("network").name - @current_name = BACKENDS.invert[name] + service = SystemdService.find("network") + @current_name = BACKENDS.invert[service.name] if service end @cached_name = @current_name @@ -421,6 +436,8 @@ # 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 @@ -444,6 +461,7 @@ 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.76/library/packages/src/modules/SlideShow.rb new/yast2-3.1.78/library/packages/src/modules/SlideShow.rb --- old/yast2-3.1.76/library/packages/src/modules/SlideShow.rb 2014-06-09 14:31:33.000000000 +0200 +++ new/yast2-3.1.78/library/packages/src/modules/SlideShow.rb 2014-06-11 13:41:20.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.76/library/packages/test/slide_show_test.rb new/yast2-3.1.78/library/packages/test/slide_show_test.rb --- old/yast2-3.1.76/library/packages/test/slide_show_test.rb 2014-06-09 14:31:33.000000000 +0200 +++ new/yast2-3.1.78/library/packages/test/slide_show_test.rb 2014-06-11 13:41:20.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.76/package/yast2.changes new/yast2-3.1.78/package/yast2.changes --- old/yast2-3.1.76/package/yast2.changes 2014-06-09 14:31:34.000000000 +0200 +++ new/yast2-3.1.78/package/yast2.changes 2014-06-11 13:41:21.000000000 +0200 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Wed Jun 11 10:02:27 UTC 2014 - mfilka@suse.com + +- bnc#878719 + - improved handling of inactive network service +- 3.1.78 + +------------------------------------------------------------------- +Tue Jun 10 16:31:19 UTC 2014 - lslezak@suse.cz + +- 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 - mfilka@suse.com - bnc#864619 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.76/package/yast2.spec new/yast2-3.1.78/package/yast2.spec --- old/yast2-3.1.76/package/yast2.spec 2014-06-09 14:31:34.000000000 +0200 +++ new/yast2-3.1.78/package/yast2.spec 2014-06-11 13:41:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.76 +Version: 3.1.78 Release: 0 URL: https://github.com/yast/yast-yast2 continue with "q"... Checked in at Wed Jun 11 15:27:18 CEST 2014 by bg Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org