Hello community,

here is the log from the commit of package yast2-storage for openSUSE:Factory 
checked in at 2017-08-24 18:16:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-storage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-storage"

Thu Aug 24 18:16:40 2017 rev:296 rq:518387 version:3.2.18

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes      
2017-07-02 13:32:24.823833350 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 
2017-08-24 18:16:41.851125421 +0200
@@ -1,0 +2,25 @@
+Wed Aug 23 14:13:02 CEST 2017 - [email protected]
+
+- Merged SLE-12-SP2-CASP branch to master
+- 3.2.18
+
+-------------------------------------------------------------------
+Mon Aug 21 10:32:52 UTC 2017 - [email protected]
+
+- Fix Btrfs default subvolume name detection (bsc#1044434 and
+  bsc#1044250)
+- Read default subvolume name for Btrfs filesystems when using
+  the expert partitioner (bsc#1040154)
+
+-------------------------------------------------------------------
+Wed Aug 16 11:34:48 CEST 2017 - [email protected]
+
+- Make filesystem type for home and root configurable in control.xml
+  (bsc#1051762)
+
+-------------------------------------------------------------------
+Thu Jul 20 10:45:18 CEST 2017 - [email protected]
+
+- fixed check whether snapshots are proposed (bsc#1049108)
+
+-------------------------------------------------------------------

Old:
----
  yast2-storage-3.2.17.tar.bz2

New:
----
  yast2-storage-3.2.18.tar.bz2

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

Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.0CaeAd/_old  2017-08-24 18:16:42.555026311 +0200
+++ /var/tmp/diff_new_pack.0CaeAd/_new  2017-08-24 18:16:42.567024621 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-storage
-Version:        3.2.17
+Version:        3.2.18
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-storage-3.2.17.tar.bz2 -> yast2-storage-3.2.18.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-storage-3.2.17/.yardopts 
new/yast2-storage-3.2.18/.yardopts
--- old/yast2-storage-3.2.17/.yardopts  1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-3.2.18/.yardopts  2017-08-23 15:17:19.502492747 +0200
@@ -0,0 +1,7 @@
+--no-private
+--markup markdown
+--protected
+--readme README.md
+--output-dir ./doc/autodocs
+--files *.md
+src/**/*.rb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-storage-3.2.17/package/yast2-storage.changes 
new/yast2-storage-3.2.18/package/yast2-storage.changes
--- old/yast2-storage-3.2.17/package/yast2-storage.changes      2017-06-26 
17:12:35.446338830 +0200
+++ new/yast2-storage-3.2.18/package/yast2-storage.changes      2017-08-23 
15:17:19.518492747 +0200
@@ -1,4 +1,29 @@
 -------------------------------------------------------------------
+Wed Aug 23 14:13:02 CEST 2017 - [email protected]
+
+- Merged SLE-12-SP2-CASP branch to master
+- 3.2.18
+
+-------------------------------------------------------------------
+Mon Aug 21 10:32:52 UTC 2017 - [email protected]
+
+- Fix Btrfs default subvolume name detection (bsc#1044434 and
+  bsc#1044250)
+- Read default subvolume name for Btrfs filesystems when using
+  the expert partitioner (bsc#1040154)
+
+-------------------------------------------------------------------
+Wed Aug 16 11:34:48 CEST 2017 - [email protected]
+
+- Make filesystem type for home and root configurable in control.xml
+  (bsc#1051762)
+
+-------------------------------------------------------------------
+Thu Jul 20 10:45:18 CEST 2017 - [email protected]
+
+- fixed check whether snapshots are proposed (bsc#1049108)
+
+-------------------------------------------------------------------
 Mon Jun 26 11:13:00 CEST 2017 - [email protected]
 
 - Allow different mount point for home partition (Fate#323532)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-storage-3.2.17/package/yast2-storage.spec 
new/yast2-storage-3.2.18/package/yast2-storage.spec
--- old/yast2-storage-3.2.17/package/yast2-storage.spec 2017-06-26 
17:12:35.446338830 +0200
+++ new/yast2-storage-3.2.18/package/yast2-storage.spec 2017-08-23 
15:17:19.518492747 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-storage
-Version:        3.2.17
+Version:        3.2.18
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-storage-3.2.17/src/modules/StorageProposal.rb 
new/yast2-storage-3.2.18/src/modules/StorageProposal.rb
--- old/yast2-storage-3.2.17/src/modules/StorageProposal.rb     2017-06-26 
17:12:35.466338830 +0200
+++ new/yast2-storage-3.2.18/src/modules/StorageProposal.rb     2017-08-23 
15:17:19.550492747 +0200
@@ -356,6 +356,9 @@
 
         SetProposalDefault(false)
         Builtins.y2milestone("GetControlCfg cfg_xml: %1", @cfg_xml)
+
+        @proposal_home_fs = get_fs_type_from_control_xml("home_fs", 
@proposal_home_fs)
+        @proposal_root_fs = get_fs_type_from_control_xml("root_fs", 
@proposal_root_fs)
       end
       ret = deep_copy(@cfg_xml)
       Builtins.y2milestone(
@@ -6601,7 +6604,7 @@
       ret = false
       if GetProposalSnapshots()
         prop_target_map.each do |device, container|
-          container["partitions"].each do |volume|
+          container.fetch("partitions", []).each do |volume|
             if !volume.fetch("delete", false)
               if volume.fetch("used_fs", :none) == :btrfs && 
volume.fetch("mount", "") == "/"
                 userdata = volume.fetch("userdata", {})
@@ -6683,6 +6686,20 @@
       SetProposalEncrypt(value == :lvm_crypt)
     end
 
+    # Get a filesystem type from control.xml.
+    #
+    # @param [String] name  key below "partitioning" in control.xml
+    # @param [Symbol] fallback  fallback value if not present in control.xml
+    # @return [Symbol] filesystem type (:btrfs, :xfs, :ext4, ...)
+    #
+    def get_fs_type_from_control_xml(name, fallback)
+      fs = ProductFeatures.GetStringFeature("partitioning", name)
+      fs = fallback if fs.nil? || fs.empty?
+      fs = fs.downcase.to_sym unless fs.is_a?(Symbol)
+      log.info("#{name}: #{fs}") unless fs == fallback
+      fs
+    end
+
     publish :function => :SetCreateVg, :type => "void (boolean)"
     publish :function => :GetProposalHome, :type => "boolean ()"
     publish :function => :SetProposalHome, :type => "void (boolean)"


Reply via email to