Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2020-04-25 20:17:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager" Sat Apr 25 20:17:27 2020 rev:393 rq:795820 version:4.2.62 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2020-04-11 23:45:41.643050200 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new.2738/yast2-packager.changes 2020-04-25 20:20:45.989086964 +0200 @@ -1,0 +2,7 @@ +Mon Apr 20 11:46:59 UTC 2020 - Josef Reidinger <[email protected]> + +- prevent race condition between log rotation and migration + log backup (bsc#1166174) +- 4.2.62 + +------------------------------------------------------------------- Old: ---- yast2-packager-4.2.61.tar.bz2 New: ---- yast2-packager-4.2.62.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.Ddg1s3/_old 2020-04-25 20:20:47.277089619 +0200 +++ /var/tmp/diff_new_pack.Ddg1s3/_new 2020-04-25 20:20:47.277089619 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 4.2.61 +Version: 4.2.62 Release: 0 Summary: YaST2 - Package Library License: GPL-2.0-or-later ++++++ yast2-packager-4.2.61.tar.bz2 -> yast2-packager-4.2.62.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.61/package/yast2-packager.changes new/yast2-packager-4.2.62/package/yast2-packager.changes --- old/yast2-packager-4.2.61/package/yast2-packager.changes 2020-04-08 17:15:20.000000000 +0200 +++ new/yast2-packager-4.2.62/package/yast2-packager.changes 2020-04-20 14:05:07.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 20 11:46:59 UTC 2020 - Josef Reidinger <[email protected]> + +- prevent race condition between log rotation and migration + log backup (bsc#1166174) +- 4.2.62 + +------------------------------------------------------------------- Wed Apr 8 14:44:49 UTC 2020 - Ladislav Slezák <[email protected]> - Allow updating the roles via self_update repository (bsc#1168702) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.61/package/yast2-packager.spec new/yast2-packager-4.2.62/package/yast2-packager.spec --- old/yast2-packager-4.2.61/package/yast2-packager.spec 2020-04-08 17:15:20.000000000 +0200 +++ new/yast2-packager-4.2.62/package/yast2-packager.spec 2020-04-20 14:05:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 4.2.61 +Version: 4.2.62 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.2.61/src/clients/inst_kickoff.rb new/yast2-packager-4.2.62/src/clients/inst_kickoff.rb --- old/yast2-packager-4.2.61/src/clients/inst_kickoff.rb 2020-04-08 17:15:20.000000000 +0200 +++ new/yast2-packager-4.2.62/src/clients/inst_kickoff.rb 2020-04-20 14:05:07.000000000 +0200 @@ -165,58 +165,61 @@ # timestamp date = Builtins.timestring("%Y%m%d", ::Time.now.to_i, false) - Builtins.y2milestone("Creating backup of %1", Directory.logdir) + # do not backup logs on running system (bsc#1166174) + if Installation.destdir != "/" + Builtins.y2milestone("Creating backup of %1", Directory.logdir) - filename = "" - num = 0 + filename = "" + num = 0 - while Ops.less_than(num, 42) - filename = Ops.add( - Ops.add( + while Ops.less_than(num, 42) + filename = Ops.add( Ops.add( Ops.add( - Ops.add(Installation.update_backup_path, "/YaST2-"), - date + Ops.add( + Ops.add(Installation.update_backup_path, "/YaST2-"), + date + ), + "-" ), - "-" + Builtins.sformat("%1", num) ), - Builtins.sformat("%1", num) - ), - ".tar.gz" - ) - if SCR.Read( - path(".target.size"), - Ops.add(Installation.destdir, filename) - ) == -1 - break - end + ".tar.gz" + ) + if SCR.Read( + path(".target.size"), + Ops.add(Installation.destdir, filename) + ) == -1 + break + end - num = Ops.add(num, 1) - end + num = Ops.add(num, 1) + end - if SCR.Execute( - path(".target.bash"), - "cd #{Shellwords.escape(Installation.destdir)}; " \ - "/bin/tar --ignore-failed-read -czf .#{Shellwords.escape(filename)} var/log/YaST2" - ).nonzero? - Builtins.y2error( - "backup of %1 to %2 failed", - Directory.logdir, - filename - ) - # an error popup - Popup.Error( - Builtins.sformat( - _("Backup of %1 failed. See %2 for details."), + if SCR.Execute( + path(".target.bash"), + "cd #{Shellwords.escape(Installation.destdir)}; " \ + "/bin/tar --ignore-failed-read -czf .#{Shellwords.escape(filename)} var/log/YaST2" + ).nonzero? + Builtins.y2error( + "backup of %1 to %2 failed", Directory.logdir, - Ops.add(Directory.logdir, "/y2log") + filename ) - ) - else - SCR.Execute( - path(".target.bash"), - "cd #{Installation.destdir.shellescape}; /bin/rm -rf var/log/YaST2/*" - ) + # an error popup + Popup.Error( + Builtins.sformat( + _("Backup of %1 failed. See %2 for details."), + Directory.logdir, + Ops.add(Directory.logdir, "/y2log") + ) + ) + else + SCR.Execute( + path(".target.bash"), + "cd #{Installation.destdir.shellescape}; /bin/rm -rf var/log/YaST2/*" + ) + end end if Installation.update_backup_sysconfig
