Skip to content

Commit

Permalink
Fix AddOn auto client (#63)
Browse files Browse the repository at this point in the history
* Fix AddOn auto client

After its refactorization in b0d2901, the #main method is no longer
available. Using #run instead.

* Bring back missing dependencies

They were forgotten in the AddOn auto client refactorization

* Update version and changelog
  • Loading branch information
dgdavid committed Aug 31, 2018
1 parent 85d18bc commit 4d06329
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
7 changes: 7 additions & 0 deletions package/yast2-add-on.changes
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Aug 30 08:50:09 UTC 2018 - dgonzalez@suse.com

- Fix the run of AddOn auto client (bsc#1106536).
- Add missing dependencies to the AddOn auto client.
- 4.1.5

-------------------------------------------------------------------
Mon Aug 27 11:11:21 UTC 2018 - knut.anderssen@suse.com

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-add-on.spec
Expand Up @@ -17,7 +17,7 @@


Name: yast2-add-on
Version: 4.1.4
Version: 4.1.5
Release: 0
Summary: YaST2 - Add-On media installation code
License: GPL-2.0-only
Expand Down
2 changes: 1 addition & 1 deletion src/clients/add-on_auto.rb
@@ -1,3 +1,3 @@
require "add-on/clients/add-on_auto"

Yast::AddOnAutoClient.new.main
Yast::AddOnAutoClient.new.run
8 changes: 6 additions & 2 deletions src/lib/add-on/clients/add-on_auto.rb
Expand Up @@ -3,6 +3,10 @@

Yast.import "AddOnProduct"
Yast.import "AutoinstSoftware"
Yast.import "Installation"
Yast.import "Label"
Yast.import "PackageCallbacks"
Yast.import "PackageLock"
Yast.import "Progress"

module Yast
Expand All @@ -12,9 +16,9 @@ def run

Yast.include self, "add-on/add-on-workflow.rb"

progress_orig = Yast::Progress.set(false)
progress_orig = Progress.set(false)
ret = super
Yast::Progress.set(progress_orig)
Progress.set(progress_orig)

ret
end
Expand Down

0 comments on commit 4d06329

Please sign in to comment.