Skip to content

Commit

Permalink
Merge branch 'SLE-15-SP3' into bsc-1193784
Browse files Browse the repository at this point in the history
  • Loading branch information
imobachgs committed Dec 20, 2021
2 parents 3c6c8d3 + c762c93 commit b9bc8a6
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
5 changes: 4 additions & 1 deletion library/control/src/modules/WorkflowManager.rb
Expand Up @@ -60,6 +60,7 @@ def main
Yast.import "String"
Yast.import "XML"
Yast.import "Report"
Yast.import "Mode"

#
# This API uses some new terms that need to be explained:
Expand Down Expand Up @@ -1694,7 +1695,9 @@ def fetch_package(repo_id, package, dir)
Tempfile.open("downloaded-package-") do |tmp|
# libzypp needs the target for verifying the GPG signatures of the downloaded packages,
# keep the target initialized, it might be needed later for verifying other packages
Pkg.TargetInitialize("/") if Stage.initial
# However, avoid this call when running on update mode because we need the repositories
# from the system to upgrade too.
Pkg.TargetInitialize("/") if Stage.initial && !Mode.update
downloader.download(tmp.path)

extract(tmp.path, dir)
Expand Down
7 changes: 7 additions & 0 deletions package/yast2.changes
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Dec 20 11:07:31 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

- Do not reinitialize the packaging system during offline
upgrade (bsc#1193784 and bsc#1192437).
- 4.4.31

-------------------------------------------------------------------
Thu Dec 16 08:39:01 UTC 2021 - Ladislav Slezák <lslezak@suse.cz>

Expand Down
3 changes: 2 additions & 1 deletion package/yast2.spec
Expand Up @@ -17,7 +17,8 @@


Name: yast2
Version: 4.4.30
Version: 4.4.31

Release: 0
Summary: YaST2 Main Package
License: GPL-2.0-only
Expand Down

0 comments on commit b9bc8a6

Please sign in to comment.