Hello community,

here is the log from the commit of package yast2-s390 for openSUSE:Factory 
checked in at 2019-07-23 22:36:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-s390 (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-s390.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-s390"

Tue Jul 23 22:36:17 2019 rev:12 rq:717676 version:4.2.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-s390/yast2-s390.changes    2019-07-18 
15:22:33.848121103 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-s390.new.4126/yast2-s390.changes  
2019-07-23 22:36:18.918984535 +0200
@@ -1,0 +2,6 @@
+Fri Jul 19 11:57:09 CEST 2019 - [email protected]
+
+- handle setting diag mode on active DASDs (part of bsc#1134927)
+- 4.2.2
+
+-------------------------------------------------------------------

Old:
----
  yast2-s390-4.2.1.tar.bz2

New:
----
  yast2-s390-4.2.2.tar.bz2

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

Other differences:
------------------
++++++ yast2-s390.spec ++++++
--- /var/tmp/diff_new_pack.Bspi8E/_old  2019-07-23 22:36:19.570984401 +0200
+++ /var/tmp/diff_new_pack.Bspi8E/_new  2019-07-23 22:36:19.578984399 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-s390
-Version:        4.2.1
+Version:        4.2.2
 Release:        0
 Summary:        YaST2 - S/390 Specific Features Configuration
 License:        GPL-2.0-only

++++++ yast2-s390-4.2.1.tar.bz2 -> yast2-s390-4.2.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-s390-4.2.1/package/yast2-s390.changes 
new/yast2-s390-4.2.2/package/yast2-s390.changes
--- old/yast2-s390-4.2.1/package/yast2-s390.changes     2019-07-17 
18:22:59.000000000 +0200
+++ new/yast2-s390-4.2.2/package/yast2-s390.changes     2019-07-22 
21:03:57.000000000 +0200
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Fri Jul 19 11:57:09 CEST 2019 - [email protected]
+
+- handle setting diag mode on active DASDs (part of bsc#1134927)
+- 4.2.2
+
+-------------------------------------------------------------------
 Tue Jul 16 11:27:09 CEST 2019 - [email protected]
 
 - sort DASDs by channel ID (part of bsc#1134927)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-s390-4.2.1/package/yast2-s390.spec 
new/yast2-s390-4.2.2/package/yast2-s390.spec
--- old/yast2-s390-4.2.1/package/yast2-s390.spec        2019-07-17 
18:22:59.000000000 +0200
+++ new/yast2-s390-4.2.2/package/yast2-s390.spec        2019-07-22 
21:03:57.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-s390
-Version:        4.2.1
+Version:        4.2.2
 Release:        0
 Group:          System/YaST
 License:        GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-s390-4.2.1/src/include/s390/dasd/dialogs.rb 
new/yast2-s390-4.2.2/src/include/s390/dasd/dialogs.rb
--- old/yast2-s390-4.2.1/src/include/s390/dasd/dialogs.rb       2019-07-17 
18:22:59.000000000 +0200
+++ new/yast2-s390-4.2.2/src/include/s390/dasd/dialogs.rb       2019-07-22 
21:03:57.000000000 +0200
@@ -285,8 +285,8 @@
               [id, "resource", "io", 0, "active"],
               false
             )
+            DASDController.ActivateDiag(channel, value) if active
             Ops.set(DASDController.diag, channel, value)
-            DASDController.ActivateDisk(channel, value) if active
           end
           DASDController.ProbeDisks
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-s390-4.2.1/src/modules/DASDController.rb 
new/yast2-s390-4.2.2/src/modules/DASDController.rb
--- old/yast2-s390-4.2.1/src/modules/DASDController.rb  2019-07-17 
18:22:59.000000000 +0200
+++ new/yast2-s390-4.2.2/src/modules/DASDController.rb  2019-07-22 
21:03:57.000000000 +0200
@@ -570,6 +570,16 @@
       nil
     end
 
+    # Activate or deactivate diag on active disk
+    # @param [String] channel string Name of the disk to operate on
+    # @param [Boolean] diag boolean Activate DIAG or not
+    def ActivateDiag(channel, diag)
+      old_diag = DASDController.diag.fetch(channel, false)
+      return if diag == old_diag
+      DeactivateDisk(channel, old_diag)
+      ActivateDisk(channel, diag)
+    end
+
     # Format disks
     # @param [Array<String>] disks_list list<string> List of disks to be 
formatted
     # @param [Fixnum] par integer Number of disks that can be formated in 
parallel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-s390-4.2.1/test/dasd_controller_test.rb 
new/yast2-s390-4.2.2/test/dasd_controller_test.rb
--- old/yast2-s390-4.2.1/test/dasd_controller_test.rb   2019-07-17 
18:22:59.000000000 +0200
+++ new/yast2-s390-4.2.2/test/dasd_controller_test.rb   2019-07-22 
21:03:57.000000000 +0200
@@ -264,4 +264,13 @@
       end
     end
   end
+
+  describe "#ActivateDiag" do
+    it "deactivates and reactivates dasd" do
+      expect(Yast::DASDController).to receive(:DeactivateDisk).ordered
+      expect(Yast::DASDController).to receive(:ActivateDisk).ordered
+      expect(Yast::DASDController.ActivateDiag("0.0.3333", true)).to eq(nil)
+    end
+  end
+
 end


Reply via email to