Hello community,
here is the log from the commit of package yast2-add-on for openSUSE:Factory
checked in at 2014-06-26 08:00:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old)
and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes
2014-06-02 07:04:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes
2014-06-26 08:00:59.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Jun 2 16:49:24 UTC 2014 - jreidin...@suse.com
+
+- always set correct state for add-on add checkbox dialog
+- 3.1.8
+
+-------------------------------------------------------------------
+Mon Jun 2 16:24:42 UTC 2014 - jreidin...@suse.com
+
+- Properly show summary screen in installation after adding first
+ add-on
+- make Abort button working on add-on work-flow (bnc#879397)
+- 3.1.7
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-3.1.6.tar.bz2
New:
----
yast2-add-on-3.1.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on.spec ++++++
--- /var/tmp/diff_new_pack.CrBWyR/_old 2014-06-26 08:00:59.000000000 +0200
+++ /var/tmp/diff_new_pack.CrBWyR/_new 2014-06-26 08:00:59.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-add-on
-Version: 3.1.6
+Version: 3.1.8
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-add-on-3.1.6.tar.bz2 -> yast2-add-on-3.1.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-3.1.6/package/yast2-add-on.changes
new/yast2-add-on-3.1.8/package/yast2-add-on.changes
--- old/yast2-add-on-3.1.6/package/yast2-add-on.changes 2014-05-22
08:46:21.000000000 +0200
+++ new/yast2-add-on-3.1.8/package/yast2-add-on.changes 2014-06-02
19:01:29.000000000 +0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Mon Jun 2 16:49:24 UTC 2014 - jreidin...@suse.com
+
+- always set correct state for add-on add checkbox dialog
+- 3.1.8
+
+-------------------------------------------------------------------
+Mon Jun 2 16:24:42 UTC 2014 - jreidin...@suse.com
+
+- Properly show summary screen in installation after adding first
+ add-on
+- make Abort button working on add-on work-flow (bnc#879397)
+- 3.1.7
+
+-------------------------------------------------------------------
Wed May 21 20:08:35 UTC 2014 - jreidin...@suse.com
- Do not create endless loop in add-on selection (bnc#878997)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-3.1.6/package/yast2-add-on.spec
new/yast2-add-on-3.1.8/package/yast2-add-on.spec
--- old/yast2-add-on-3.1.6/package/yast2-add-on.spec 2014-05-22
08:46:21.000000000 +0200
+++ new/yast2-add-on-3.1.8/package/yast2-add-on.spec 2014-06-02
19:01:29.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-add-on
-Version: 3.1.6
+Version: 3.1.8
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-add-on-3.1.6/src/include/add-on/add-on-workflow.rb
new/yast2-add-on-3.1.8/src/include/add-on/add-on-workflow.rb
--- old/yast2-add-on-3.1.6/src/include/add-on/add-on-workflow.rb
2014-05-22 08:46:21.000000000 +0200
+++ new/yast2-add-on-3.1.8/src/include/add-on/add-on-workflow.rb
2014-06-02 19:01:29.000000000 +0200
@@ -1147,6 +1147,11 @@
# adding new add-on
elsif ret == :add || ret == :first_time
+ # show checkbox only first time in installation when there is no
+ # other addons, so allow to quickly skip adding addons, otherwise
+ # it make no sense as user explicitelly want add addon
+ SourceDialogs.display_addon_checkbox = ret == :first_time
+
# bugzilla #293428
# Release all sources before adding a new one
# because of CD/DVD + url cd://
@@ -1169,6 +1174,8 @@
# check whether it requests registration (FATE #301312)
AddOnProduct.PrepareForRegistration(AddOnProduct.src_id)
some_addon_changed = true
+ # do not keep first_time, otherwise summary won't be shown during
installation
+ ret = nil if ret == :first_time
elsif ret2 == :abort || ret2 == :cancel
Builtins.y2milestone("Add-on sequence aborted")
@@ -1188,6 +1195,8 @@
AddOnProduct.src_id
end
end
+ # properly return abort in installation
+ ret = :abort if ret == :first_time
# extra handling for the global enable checkbox
elsif ret == :first_time
ret = :back if ret2 == :back
@@ -1208,7 +1217,7 @@
# because of CD/DVD + url cd://
Pkg.SourceReleaseAll
end
- end until ret == :next || ret == :back
+ end until [:next, :back, :abort].include?(ret)
Builtins.y2milestone(
"Ret: %1, Some Add-on Added/Removed: %2",
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
