Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2014-06-18 07:47:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old)
and /work/SRC/openSUSE:Factory/.yast2-packager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2014-06-08 13:36:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2014-06-18 07:47:53.000000000 +0200
@@ -1,0 +2,16 @@
+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:
+ - display URL where to download the license (bnc#880685)
+ - display a checkbox instead radio buttons (bnc#878976)
+- 3.1.22
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-3.1.21.tar.bz2
New:
----
yast2-packager-3.1.23.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.inYQbG/_old 2014-06-18 07:47:54.000000000 +0200
+++ /var/tmp/diff_new_pack.inYQbG/_new 2014-06-18 07:47:54.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 3.1.21
+Version: 3.1.23
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-packager-3.1.21.tar.bz2 -> yast2-packager-3.1.23.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.21/package/yast2-packager.changes new/yast2-packager-3.1.23/package/yast2-packager.changes
--- old/yast2-packager-3.1.21/package/yast2-packager.changes 2014-06-02 10:59:28.000000000 +0200
+++ new/yast2-packager-3.1.23/package/yast2-packager.changes 2014-06-13 10:29:49.000000000 +0200
@@ -1,4 +1,20 @@
-------------------------------------------------------------------
+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:
+ - display URL where to download the license (bnc#880685)
+ - display a checkbox instead radio buttons (bnc#878976)
+- 3.1.22
+
+-------------------------------------------------------------------
Fri May 30 16:55:25 UTC 2014 - lslezak@suse.cz
- allow adding a title to license dialog (needed for on-line
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.21/package/yast2-packager.spec new/yast2-packager-3.1.23/package/yast2-packager.spec
--- old/yast2-packager-3.1.21/package/yast2-packager.spec 2014-06-02 10:59:28.000000000 +0200
+++ new/yast2-packager-3.1.23/package/yast2-packager.spec 2014-06-13 10:29:49.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 3.1.21
+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.21/src/modules/PackageSlideShow.rb new/yast2-packager-3.1.23/src/modules/PackageSlideShow.rb
--- old/yast2-packager-3.1.21/src/modules/PackageSlideShow.rb 2014-06-02 10:59:28.000000000 +0200
+++ new/yast2-packager-3.1.23/src/modules/PackageSlideShow.rb 2014-06-13 10:29:50.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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.21/src/modules/ProductLicense.rb new/yast2-packager-3.1.23/src/modules/ProductLicense.rb
--- old/yast2-packager-3.1.21/src/modules/ProductLicense.rb 2014-06-02 10:59:28.000000000 +0200
+++ new/yast2-packager-3.1.23/src/modules/ProductLicense.rb 2014-06-13 10:29:50.000000000 +0200
@@ -10,10 +10,11 @@
# Lukas Ocilka