Hello community,

here is the log from the commit of package yast2-storage for openSUSE:Factory 
checked in at 2016-07-12 23:44:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-storage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-storage"

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes      
2016-06-10 23:59:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 
2016-07-12 23:44:54.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jul  4 18:07:03 CEST 2016 - shundham...@suse.de
+
+- Never try to reuse partitions if any DASD is involved (bsc#983003)
+- 3.1.95
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.UGVbYw/_old  2016-07-12 23:44:55.000000000 +0200
+++ /var/tmp/diff_new_pack.UGVbYw/_new  2016-07-12 23:44:55.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-storage
-Version:        3.1.94
+Version:        3.1.95
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-storage-3.1.94.tar.bz2 -> yast2-storage-3.1.95.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-storage-3.1.94/package/yast2-storage.changes 
new/yast2-storage-3.1.95/package/yast2-storage.changes
--- old/yast2-storage-3.1.94/package/yast2-storage.changes      2016-06-07 
13:53:58.000000000 +0200
+++ new/yast2-storage-3.1.95/package/yast2-storage.changes      2016-07-05 
10:49:16.000000000 +0200
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Jul  4 18:07:03 CEST 2016 - shundham...@suse.de
+
+- Never try to reuse partitions if any DASD is involved (bsc#983003)
+- 3.1.95
+
+-------------------------------------------------------------------
 Tue Jun  7 11:23:00 UTC 2016 - igonzalezs...@suse.com
 
 - Stop generating autodocs (fate#320356)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-storage-3.1.94/package/yast2-storage.spec 
new/yast2-storage-3.1.95/package/yast2-storage.spec
--- old/yast2-storage-3.1.94/package/yast2-storage.spec 2016-06-07 
13:53:58.000000000 +0200
+++ new/yast2-storage-3.1.95/package/yast2-storage.spec 2016-07-05 
10:49:16.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-storage
-Version:        3.1.94
+Version:        3.1.95
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-storage-3.1.94/src/modules/StorageProposal.rb 
new/yast2-storage-3.1.95/src/modules/StorageProposal.rb
--- old/yast2-storage-3.1.94/src/modules/StorageProposal.rb     2016-06-07 
13:53:58.000000000 +0200
+++ new/yast2-storage-3.1.95/src/modules/StorageProposal.rb     2016-07-05 
10:49:16.000000000 +0200
@@ -4514,6 +4514,24 @@
 
     end
 
+    # Check if a disk is a DASD.
+    #
+    # @param [String] disk_name device name of the disk
+    # @return [bool] true if it is a DASD, false if not
+    #
+    def is_dasd?(disk_name)
+      return false if disk_name.nil?
+      disk_name.start_with?("/dev/dasd")
+    end
+
+    # Check if any disk in a string array is a DASD.
+    #
+    # @param [Array<String>] disk_names device names of the disks
+    # @return [bool] true if any of them is a DASD, false if not
+    #
+    def any_dasd?(disk_names)
+      disk_names.any? { |disk| is_dasd?(disk) }
+    end
 
     def get_inst_proposal(target)
       target = deep_copy(target)
@@ -4537,6 +4555,10 @@
       target = prepare_part_lists(ddev, target)
       mode = :free
       while mode != :end && Builtins.size(sol_disk) == 0
+        if any_dasd?(ddev) && mode == :reuse
+          log.info("Skipping reuse mode for DASD")
+          mode = :desperate # bsc#983003
+        end
         if mode == :free || mode == :desperate
           valid = Builtins.listmap(ddev) { |s| { s => true } }
           if mode == :desperate


Reply via email to