Merge e51a767 into 0f5b704

yast · Mar 8, 2021 · e47d519 · e47d519
2 parents 0f5b704 + e51a767
commit e47d519
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar  8 16:41:27 UTC 2021 - Josef Reidinger <jreidinger@suse.com>
+
+- save_y2logs: Make modified content of log files just warning
+  instead of fatal (bsc#1182710 see comment 2)
+- 4.3.58
+
 -------------------------------------------------------------------
 Mon Mar  8 09:19:37 UTC 2021 - David Diaz <dgonzalez@suse.com>
 

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

diff --git a/scripts/save_y2logs b/scripts/save_y2logs
@@ -142,11 +142,14 @@ echo "Saving YaST logs to $TARGET" >&2
 
 [ -n "$COMPRESSION" ] && COMPRESSION="--$COMPRESSION"
 
-tar cf "$TARGET" $COMPRESSION --dereference -C / $LIST -C /var/log $LIST_VAR -C $TMPDIR $LIST_TMP
+tar cf "$TARGET" --warning=no-file-changed $COMPRESSION --dereference -C / $LIST -C /var/log $LIST_VAR -C $TMPDIR $LIST_TMP
 err=$?
 
 rm -rf $TMPDIR
 
+# tar returns 1 when content of tarball is older then current system. Happen when something still writting to logs or memsampler (bsc#1182710#c2)
+[ $err == 1 ] && echo "Warning: logs modified during save. Yast is probably running. Content of tarball can be older than current content." >&2 && err=0
+
 [ $err != 0 ] && echo "FATAL: Error creating archive $TARGET" >&2
 
 exit $err