Hello community,
here is the log from the commit of package yast2-add-on for openSUSE:Factory
checked in at 2015-10-20 16:20:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-12-05 21:02:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes
2015-10-20 16:20:46.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Oct 7 19:22:13 UTC 2015 - lsle...@suse.cz
+
+- restart the installation workflow to activate the new
+ installation steps added by an add-on via installation.xml
+ (bsc#949185)
+- 3.1.11
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-3.1.10.tar.bz2
New:
----
yast2-add-on-3.1.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on.spec ++++++
--- /var/tmp/diff_new_pack.ZUzkGF/_old 2015-10-20 16:20:47.000000000 +0200
+++ /var/tmp/diff_new_pack.ZUzkGF/_new 2015-10-20 16:20:47.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-add-on
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-add-on
-Version: 3.1.10
+Version: 3.1.11
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-add-on-3.1.10.tar.bz2 -> yast2-add-on-3.1.11.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-3.1.10/CONTRIBUTING.md
new/yast2-add-on-3.1.11/CONTRIBUTING.md
--- old/yast2-add-on-3.1.10/CONTRIBUTING.md 2014-12-04 10:54:51.000000000
+0100
+++ new/yast2-add-on-3.1.11/CONTRIBUTING.md 2015-10-08 15:00:10.000000000
+0200
@@ -12,13 +12,13 @@
-----------
If you find a problem, please report it either using
-[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2)
+[Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2)
or [GitHub issues](../../issues). (For Bugzilla, use the [simplified
registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp)
if you don't have an account yet.)
If you find a problem, please report it either using
-[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee
+[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee
that every bug will be fixed, but we'll try.
When creating a bug report, please follow our [bug reporting
@@ -71,7 +71,7 @@
[widely used
conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
-If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure
+If your commit is related to a bug in Bugzilla or an issue on GitHub, make sure
you mention it in the commit message for cross-reference. Use format like
bnc#775814 or gh#yast/yast-foo#42. See also [GitHub
autolinking](https://help.github.com/articles/github-flavored-markdown#references)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-3.1.10/package/yast2-add-on.changes
new/yast2-add-on-3.1.11/package/yast2-add-on.changes
--- old/yast2-add-on-3.1.10/package/yast2-add-on.changes 2014-12-04
10:54:51.000000000 +0100
+++ new/yast2-add-on-3.1.11/package/yast2-add-on.changes 2015-10-08
15:00:10.000000000 +0200
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Wed Oct 7 19:22:13 UTC 2015 - lsle...@suse.cz
+
+- restart the installation workflow to activate the new
+ installation steps added by an add-on via installation.xml
+ (bsc#949185)
+- 3.1.11
+
+-------------------------------------------------------------------
Thu Dec 4 09:49:06 UTC 2014 - jreidin...@suse.com
- remove X-KDE-Library from desktop file (bnc#899104)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-3.1.10/package/yast2-add-on.spec
new/yast2-add-on-3.1.11/package/yast2-add-on.spec
--- old/yast2-add-on-3.1.10/package/yast2-add-on.spec 2014-12-04
10:54:51.000000000 +0100
+++ new/yast2-add-on-3.1.11/package/yast2-add-on.spec 2015-10-08
15:00:10.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-add-on
-Version: 3.1.10
+Version: 3.1.11
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-3.1.10/src/clients/add-on.rb
new/yast2-add-on-3.1.11/src/clients/add-on.rb
--- old/yast2-add-on-3.1.10/src/clients/add-on.rb 2014-12-04
10:54:51.000000000 +0100
+++ new/yast2-add-on-3.1.11/src/clients/add-on.rb 2015-10-08
15:00:10.000000000 +0200
@@ -15,7 +15,7 @@
Yast.import "AddOnProduct"
Yast.import "Confirm"
Yast.import "PackageLock"
- Yast.import "PackageCallbacksInit"
+ Yast.import "PackageCallbacks"
Yast.import "Report"
Yast.import "Wizard"
Yast.import "GetInstArgs"
@@ -130,7 +130,7 @@
Pkg.TargetInitialize("/")
Pkg.TargetLoad
- PackageCallbacksInit.InitPackageCallbacks
+ PackageCallbacks.InitPackageCallbacks
# Initialize current sources
Read()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-3.1.10/src/clients/add-on_auto.rb
new/yast2-add-on-3.1.11/src/clients/add-on_auto.rb
--- old/yast2-add-on-3.1.10/src/clients/add-on_auto.rb 2014-12-04
10:54:51.000000000 +0100
+++ new/yast2-add-on-3.1.11/src/clients/add-on_auto.rb 2015-10-08
15:00:10.000000000 +0200
@@ -27,7 +27,7 @@
Yast.import "AddOnProduct"
Yast.import "Progress"
Yast.import "AutoinstSoftware"
- Yast.import "PackageCallbacksInit"
+ Yast.import "PackageCallbacks"
Yast.import "Label"
Yast.import "AutoinstGeneral"
Yast.import "PackageLock"
@@ -94,7 +94,7 @@
elsif @func == "Change"
Wizard.CreateDialog
AutoinstSoftware.pmInit
- PackageCallbacksInit.InitPackageCallbacks
+ PackageCallbacks.InitPackageCallbacks
@ret = RunAddOnMainDialog(
false,
true,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-3.1.10/src/clients/inst_add-on.rb
new/yast2-add-on-3.1.11/src/clients/inst_add-on.rb
--- old/yast2-add-on-3.1.10/src/clients/inst_add-on.rb 2014-12-04
10:54:51.000000000 +0100
+++ new/yast2-add-on-3.1.11/src/clients/inst_add-on.rb 2015-10-08
15:00:10.000000000 +0200
@@ -6,6 +6,10 @@
# Authors: Jiri Srain <jsr...@suse.de>
#
module Yast
+ # @note This client should not be called from other clients directly
+ # via WFM.call (only from the control.xml file), it can restart the workflow
+ # from the next step and return to the caller AFTER the complete workflow
+ # is finished (or aborted)
class InstAddOnClient < Client
def main
Yast.import "UI"
@@ -15,7 +19,7 @@
Yast.import "AddOnProduct"
Yast.import "GetInstArgs"
Yast.import "Packages"
- Yast.import "PackageCallbacksInit"
+ Yast.import "PackageCallbacks"
Yast.import "Popup"
Yast.import "ProductControl"
Yast.import "Report"
@@ -36,7 +40,7 @@
Packages.SelectProduct
- PackageCallbacksInit.SetMediaCallbacks
+ PackageCallbacks.SetMediaCallbacks
# add add-ons specified on the kernel command line
@addon_opt = Linuxrc.InstallInf("addon")
@@ -85,6 +89,17 @@
true
)
+ if @ret == :next
+ # be careful when calling this client from other modules, this will
+ # start the workflow from the next step and THEN return back
+ # to the caller
+ @ret = ProductControl.RunFrom(
+ Ops.add(ProductControl.CurrentStep, 1),
+ true
+ )
+ @ret = :finish if @ret == :next
+ end
+
@ret
# EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-add-on-3.1.10/src/clients/inst_language_add-on.rb
new/yast2-add-on-3.1.11/src/clients/inst_language_add-on.rb
--- old/yast2-add-on-3.1.10/src/clients/inst_language_add-on.rb 2014-12-04
10:54:51.000000000 +0100
+++ new/yast2-add-on-3.1.11/src/clients/inst_language_add-on.rb 2015-10-08
15:00:10.000000000 +0200
@@ -132,10 +132,10 @@
Builtins.y2milestone("Using URL: '%1'", add_on_url)
- Yast.import "PackageCallbacksInit"
+ Yast.import "PackageCallbacks"
Yast.import "SourceManager"
- PackageCallbacksInit.InitPackageCallbacks
+ PackageCallbacks.InitPackageCallbacks
Pkg.TargetInit("/", true)
Pkg.SourceStartManager(true)
