Merge pull request #1129 from yast/init_fixup

yast · Jan 13, 2021 · 183cdeb · 183cdeb
2 parents 1621c50 + 0304cf1
commit 183cdeb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/library/control/src/modules/WorkflowManager.rb b/library/control/src/modules/WorkflowManager.rb
@@ -1678,10 +1678,10 @@ def fetch_package(repo_id, package, dir)
       downloader = ::Packages::PackageDownloader.new(repo_id, package)
 
       Tempfile.open("downloaded-package-") do |tmp|
-        # libzypp needs the target for verifying the GPG signatures of the downloaded packages
+        # 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
         downloader.download(tmp.path)
-        Pkg.TargetFinish() if Stage.initial
 
         extract(tmp.path, dir)
         # the RPM package file is not needed after extracting it's content,

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 13 16:03:51 UTC 2021 - Ladislav Slezák <lslezak@suse.cz>
+
+- Keep the libzypp target open to verify other packages
+  (bsc#1180858, related to the previous fix bsc#1179773)
+- 4.2.90
+
 -------------------------------------------------------------------
 Mon Jan 11 13:20:55 UTC 2021 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.2.89
+Version:        4.2.90
 Release:        0
 Summary:        YaST2 Main Package
 License:        GPL-2.0-only