Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package yast2-packager for openSUSE:Factory 
checked in at 2021-04-23 17:50:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-packager.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-packager"

Fri Apr 23 17:50:32 2021 rev:410 rq:887502 version:4.4.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes    
2021-04-10 15:26:19.614304317 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-packager.new.12324/yast2-packager.changes 
2021-04-23 17:50:43.790804924 +0200
@@ -1,0 +2,8 @@
+Thu Apr 22 07:51:02 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Revert copying the libzypp cache to the target system and
+  replacing it by a symlink, it is not safe and it can
+  cause crash (segfault) in some cases (bsc#1183711)
+- 4.4.1
+
+-------------------------------------------------------------------

Old:
----
  yast2-packager-4.4.0.tar.bz2

New:
----
  yast2-packager-4.4.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.NTWVvP/_old  2021-04-23 17:50:44.330805853 +0200
+++ /var/tmp/diff_new_pack.NTWVvP/_new  2021-04-23 17:50:44.334805859 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.4.0
+Version:        4.4.1
 Release:        0
 Summary:        YaST2 - Package Library
 License:        GPL-2.0-or-later

++++++ yast2-packager-4.4.0.tar.bz2 -> yast2-packager-4.4.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-4.4.0/package/yast2-packager.changes 
new/yast2-packager-4.4.1/package/yast2-packager.changes
--- old/yast2-packager-4.4.0/package/yast2-packager.changes     2021-04-07 
16:58:18.000000000 +0200
+++ new/yast2-packager-4.4.1/package/yast2-packager.changes     2021-04-22 
10:20:01.000000000 +0200
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Thu Apr 22 07:51:02 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Revert copying the libzypp cache to the target system and
+  replacing it by a symlink, it is not safe and it can
+  cause crash (segfault) in some cases (bsc#1183711)
+- 4.4.1
+
+-------------------------------------------------------------------
 Wed Apr  7 11:06:45 UTC 2021 - David Diaz <dgonza...@suse.com>
 
 - Hide the abort button when the network client is called
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-4.4.0/package/yast2-packager.spec 
new/yast2-packager-4.4.1/package/yast2-packager.spec
--- old/yast2-packager-4.4.0/package/yast2-packager.spec        2021-04-07 
16:58:18.000000000 +0200
+++ new/yast2-packager-4.4.1/package/yast2-packager.spec        2021-04-22 
10:20:01.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.4.0
+Version:        4.4.1
 Release:        0
 Summary:        YaST2 - Package Library
 License:        GPL-2.0-or-later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-4.4.0/src/clients/inst_kickoff.rb 
new/yast2-packager-4.4.1/src/clients/inst_kickoff.rb
--- old/yast2-packager-4.4.0/src/clients/inst_kickoff.rb        2021-04-07 
16:58:18.000000000 +0200
+++ new/yast2-packager-4.4.1/src/clients/inst_kickoff.rb        2021-04-22 
10:20:01.000000000 +0200
@@ -4,8 +4,6 @@
 module Yast
   # Do various tasks before starting with installation of rpms.
   class InstKickoffClient < Client
-    include Yast::Logger
-
     def main
       Yast.import "Pkg"
       textdomain "packager"
@@ -46,7 +44,16 @@
         )
       end
 
-      copy_zypp_cache
+      # copy the credential files, libzypp loads them from target
+      zypp_dir = "/etc/zypp"
+      credentials_d = zypp_dir + "/credentials.d"
+
+      if File.exist?(credentials_d) && Installation.destdir != "/"
+        target_zypp = Installation.destdir + zypp_dir
+        Builtins.y2milestone("Copying libzypp credentials to 
#{target_zypp}...")
+        ::FileUtils.mkdir_p(target_zypp)
+        ::FileUtils.cp_r(credentials_d, target_zypp)
+      end
 
       # installation, for instance...
       if !Mode.update
@@ -131,22 +138,6 @@
       :next
     end
 
-    # copy the zypp cache to the target system (only when running in inst-sys!)
-    # to save some memory during installation
-    def copy_zypp_cache
-      return unless Stage.initial
-
-      # copy the credential files (libzypp loads them from target)
-      # and the repository cache to the target system
-      Pkg.SourceCacheCopyTo(Installation.destdir)
-
-      # symlink the cache from inst-sys to save same space (RAM!)
-      cache_path = Pkg.ZConfig()["repo_cache_path"] || "/var/cache/zypp"
-      log.info("Zypp cache size: #{`du -h -s #{cache_path.shellescape}`}")
-      ::FileUtils.rm_rf(cache_path)
-      File.symlink(File.join(Installation.destdir, cache_path), cache_path)
-    end
-
     #  Handle the backup.
     def backup_stuff
       if Installation.update_backup_modified
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-packager-4.4.0/src/lib/packager/clients/pkg_finish.rb 
new/yast2-packager-4.4.1/src/lib/packager/clients/pkg_finish.rb
--- old/yast2-packager-4.4.0/src/lib/packager/clients/pkg_finish.rb     
2021-04-07 16:58:18.000000000 +0200
+++ new/yast2-packager-4.4.1/src/lib/packager/clients/pkg_finish.rb     
2021-04-22 10:20:01.000000000 +0200
@@ -98,6 +98,10 @@
       Pkg.SourceSaveAll
       Pkg.TargetFinish
 
+      # save repository metadata cache to the installed system
+      # (needs to be done _after_ saving repositories, see bnc#700881)
+      Pkg.SourceCacheCopyTo(Installation.destdir)
+
       # Patching /etc/zypp/zypp.conf in order not to install
       # recommended packages, doc-packages,...
       # (needed for products like CASP)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-4.4.0/test/pkg_finish_test.rb 
new/yast2-packager-4.4.1/test/pkg_finish_test.rb
--- old/yast2-packager-4.4.0/test/pkg_finish_test.rb    2021-04-07 
16:58:18.000000000 +0200
+++ new/yast2-packager-4.4.1/test/pkg_finish_test.rb    2021-04-22 
10:20:01.000000000 +0200
@@ -68,6 +68,7 @@
       expect(Yast::Pkg).to receive(:SourceLoad)
       expect(Yast::Pkg).to receive(:SourceSaveAll)
       expect(Yast::Pkg).to receive(:TargetFinish)
+      expect(Yast::Pkg).to receive(:SourceCacheCopyTo).with(destdir)
       allow(Yast::WFM).to receive(:Execute)
       expect(client.run).to be_nil
     end

Reply via email to