Merge pull request #979 from yast/fix_typo

Fix typo
yast · Nov 15, 2019 · 43753ef · 43753ef
2 parents 90d7757 + 407644e
commit 43753ef
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/library/system/src/lib/yast2/fs_snapshot.rb b/library/system/src/lib/yast2/fs_snapshot.rb
@@ -80,7 +80,7 @@ class FsSnapshot
 
     LIST_SNAPSHOTS_CMD =
       "/usr/bin/snapper --no-dbus --root=%{root} --utc --csvout list --disable-used-space " \
-      "--columns number,type,pre_number,date,user,cleanup,description".freeze
+      "--columns number,type,pre-number,date,user,cleanup,description".freeze
 
     # Predefined snapshot cleanup strategies (the user can define custom ones, too)
     CLEANUP_STRATEGY = { number: "number", timeline: "timeline" }.freeze

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov 15 09:30:20 UTC 2019 - Josef Reidinger <jreidinger@suse.com>
+
+- Fix crash in upgrade caused by wrong parameter to snapper
+  (bsc#1156819)
+- 4.2.34
+
 -------------------------------------------------------------------
 Tue Nov 05 14:15:16 UTC 2019 - José Iván López González <jlopez@suse.com>
 

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