Skip to content

Commit

Permalink
Do not solve dependencies while checking libzypp connection (#1070)
Browse files Browse the repository at this point in the history
  • Loading branch information
schubi2 committed Jun 30, 2020
1 parent 7cfb5ca commit b5d09c6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 0 additions & 4 deletions library/packages/src/modules/Product.rb
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ def use_installed_products?

# Ensures that we can load data from libzypp
# @return [Boolean] false if libzypp lock cannot be obtained, otherwise true
# (solver errors are ignored, see bnc#886588)
def load_zypp
if !PackageLock.Check
Builtins.y2error("Packager is locked, can't read product info!")
Expand All @@ -201,9 +200,6 @@ def load_zypp
PackageSystem.EnsureSourceInit unless Stage.initial
end

Pkg.PkgSolve(true)

# ignore solver errors
true
end

Expand Down
6 changes: 6 additions & 0 deletions package/yast2.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jun 29 15:26:44 UTC 2020 - schubi@suse.de
- Products: Do not solve dependencies while checking libzypp
connection (bsc#1170322).
- 4.3.12

-------------------------------------------------------------------
Mon Jun 29 14:26:44 UTC 2020 - José Iván López González <jlopez@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2
Version: 4.3.11
Version: 4.3.12
Release: 0
Summary: YaST2 Main Package
License: GPL-2.0-only
Expand Down

0 comments on commit b5d09c6

Please sign in to comment.