[yast-commit] [ci_new_pac] JFYI yast2-packager -> sle12
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-packager -> sle12 ## BNC# 882240 : "Build0460: Wrong total remaining time in slide show" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-packager/yast2-packager.changes 2014-06-10 10:04:53.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-packager/yast2-packager.changes 2014-06-13 10:35:47.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Jun 12 19:35:30 UTC 2014 - lslezak@suse.cz + +- make sure float time is not reported (bnc#882240) +- fix total time to be exactly the sum of per media times when + a minimum time is used +- 3.1.23 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-packager - at least 26 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-packager (Old) and /mounts/work_src_done/SLE12/yast2-packager (BS:build ID:39442 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-packager-3.1.22.tar.bz2 New: ---- yast2-packager-3.1.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.gBj0L5/_old 2014-06-13 15:01:19.000000000 +0200 +++ /var/tmp/diff_new_pack.gBj0L5/_new 2014-06-13 15:01:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.22 +Version: 3.1.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.22.tar.bz2 -> yast2-packager-3.1.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.22/package/yast2-packager.changes new/yast2-packager-3.1.23/package/yast2-packager.changes --- old/yast2-packager-3.1.22/package/yast2-packager.changes 2014-06-09 13:26:24.000000000 +0200 +++ new/yast2-packager-3.1.23/package/yast2-packager.changes 2014-06-13 10:32:23.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jun 12 19:35:30 UTC 2014 - lslezak@suse.cz + +- make sure float time is not reported (bnc#882240) +- fix total time to be exactly the sum of per media times when + a minimum time is used +- 3.1.23 + +------------------------------------------------------------------- Mon Jun 9 11:04:22 UTC 2014 - lslezak@suse.cz - ProductLicense.rb: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.22/package/yast2-packager.spec new/yast2-packager-3.1.23/package/yast2-packager.spec --- old/yast2-packager-3.1.22/package/yast2-packager.spec 2014-06-09 13:26:24.000000000 +0200 +++ new/yast2-packager-3.1.23/package/yast2-packager.spec 2014-06-13 10:32:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.22 +Version: 3.1.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.22/src/modules/PackageSlideShow.rb new/yast2-packager-3.1.23/src/modules/PackageSlideShow.rb --- old/yast2-packager-3.1.22/src/modules/PackageSlideShow.rb 2014-06-09 13:26:24.000000000 +0200 +++ new/yast2-packager-3.1.23/src/modules/PackageSlideShow.rb 2014-06-13 10:32:24.000000000 +0200 @@ -17,7 +17,7 @@ MAX_TIME_PER_CD = 7200 # minimum time displayed per CD if there is something to install - MIN_TIME_PER_CD = 10 + MIN_TIME_PER_CD = 5 # Column index for refreshing statistics: remaining size SIZE_COLUMN_POSITION = 1 @@ -367,6 +367,9 @@ seconds = Ops.divide(remaining, @bytes_per_second) end + seconds = MIN_TIME_PER_CD if seconds < MIN_TIME_PER_CD + log.debug "Updating remaining time for source #{@current_src_no} " \ + "(medium #{@current_cd_no}): #{seconds}" Ops.set( @remaining_times_per_cd_per_src, [Ops.subtract(@current_src_no, 1), Ops.subtract(@current_cd_no, 1)], @@ -414,7 +417,7 @@ total = 0 Builtins.foreach(media_mapping) do |count| total = Ops.add(total, count) - end + end Builtins.y2milestone( @@ -426,7 +429,7 @@ end end i = Ops.add(i, 1) - end + end Builtins.y2milestone("Total number of packages to download: %1", ret) @@ -523,7 +526,7 @@ Builtins.y2milestone( "PackageSlideShow::InitPkgData(): pkg: %1", @total_pkg_count_per_cd_per_src - ) + ) # RebuildDialog(true); @@ -692,10 +695,17 @@ end end + if remaining_time.is_a?(Float) + log.warn "Float time appeared: #{remaining_time}" + remaining_time = remaining_time.round + log.warn "Converted to integer: #{remaining_time}" + end + remaining_times_list << remaining_time end @remaining_times_per_cd_per_src << remaining_times_list + log.debug "Recalculated remaining time: #{@remaining_times_per_cd_per_src}" end @@ -1034,6 +1044,7 @@ if @unit_is_seconds && Ops.greater_than(@bytes_per_second, 0) remaining = Ops.divide(remaining, @bytes_per_second) + remaining = MIN_TIME_PER_CD if remaining < MIN_TIME_PER_CD rem_time = String.FormatTime(remaining) # column #2 if Ops.greater_than(remaining, MAX_TIME_PER_CD) # clip off at 2 hours continue with "q"... Checked in at Fri Jun 13 15:01:43 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
participants (1)
-
bg