Hello community, here is the log from the commit of package yast2-s390 for openSUSE:Leap:15.2 checked in at 2020-03-24 19:05:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/yast2-s390 (Old) and /work/SRC/openSUSE:Leap:15.2/.yast2-s390.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-s390" Tue Mar 24 19:05:28 2020 rev:35 rq:787746 version:4.2.4 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/yast2-s390/yast2-s390.changes 2020-01-15 16:32:21.172883144 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.yast2-s390.new.3160/yast2-s390.changes 2020-03-24 19:05:30.857495596 +0100 @@ -1,0 +2,6 @@ +Mon Mar 23 13:56:13 UTC 2020 - Imobach Gonzalez Sosa <[email protected]> + +- Properly identify zFCP devices (bsc#1158443). +- 4.2.4 + +------------------------------------------------------------------- Old: ---- yast2-s390-4.2.3.tar.bz2 New: ---- yast2-s390-4.2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-s390.spec ++++++ --- /var/tmp/diff_new_pack.4ZewoT/_old 2020-03-24 19:05:31.497500009 +0100 +++ /var/tmp/diff_new_pack.4ZewoT/_new 2020-03-24 19:05:31.501500037 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-s390 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-s390 -Version: 4.2.3 +Version: 4.2.4 Release: 0 Summary: YaST2 - S/390 Specific Features Configuration License: GPL-2.0-only ++++++ yast2-s390-4.2.3.tar.bz2 -> yast2-s390-4.2.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-4.2.3/package/yast2-s390.changes new/yast2-s390-4.2.4/package/yast2-s390.changes --- old/yast2-s390-4.2.3/package/yast2-s390.changes 2019-12-11 15:45:25.000000000 +0100 +++ new/yast2-s390-4.2.4/package/yast2-s390.changes 2020-03-23 15:07:39.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Mar 23 13:56:13 UTC 2020 - Imobach Gonzalez Sosa <[email protected]> + +- Properly identify zFCP devices (bsc#1158443). +- 4.2.4 + +------------------------------------------------------------------- Wed Dec 11 14:29:18 CET 2019 - [email protected] - Activating dumpconf: Ask the user to deactivate active kdump diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-4.2.3/package/yast2-s390.spec new/yast2-s390-4.2.4/package/yast2-s390.spec --- old/yast2-s390-4.2.3/package/yast2-s390.spec 2019-12-11 15:45:25.000000000 +0100 +++ new/yast2-s390-4.2.4/package/yast2-s390.spec 2020-03-23 15:07:39.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-s390 -Version: 4.2.3 +Version: 4.2.4 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.3/src/modules/ZFCPController.rb new/yast2-s390-4.2.4/src/modules/ZFCPController.rb --- old/yast2-s390-4.2.3/src/modules/ZFCPController.rb 2019-12-11 15:45:25.000000000 +0100 +++ new/yast2-s390-4.2.4/src/modules/ZFCPController.rb 2020-03-23 15:07:39.000000000 +0100 @@ -371,7 +371,7 @@ to: "list <map <string, any>>" ) disks = Builtins.filter(disks) do |d| - Ops.get_string(d, "bus", "") == "SCSI" + d["driver"] == "zfcp" end tapes = Convert.convert( @@ -415,11 +415,11 @@ case ret when 0 - when 1 + when 1 # FIXME: check error codes in https://github.com/SUSE/s390-tools/blob/master/zfcp_host_configure#L60 Report.Error( Builtins.sformat( # error report, %1 is device identification - _("%1: sysfs not mounted."), + _("%1: no CCW was specified or sysfs is not mounted."), channel ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-4.2.3/test/data/probe_disk.yml new/yast2-s390-4.2.4/test/data/probe_disk.yml --- old/yast2-s390-4.2.3/test/data/probe_disk.yml 2019-12-11 15:45:25.000000000 +0100 +++ new/yast2-s390-4.2.4/test/data/probe_disk.yml 2020-03-23 15:07:39.000000000 +0100 @@ -89,3 +89,43 @@ sysfs_id: "/class/block/sdb" unique_key: XGop.pffu6ea6mm8 vendor: IBM +- bus: SCSI + bus_hwcfg: scsi + class_id: 262 + detail: + channel: 0 + fcp_lun: '0x0000000000000000' + host: 0 + id: 0 + lun: 0 + wwpn: '0x0000000000000000' + dev_name: "/dev/sdc" + dev_name2: "/dev/sg3" + dev_names: + - "/dev/sdc" + - "/dev/disk/by-path/ip-10.100.12.158:3260-iscsi-iqn.2020-03.iscsi.test:for.test-lun-1" + dev_num: + major: 8 + minor: 32 + range: 16 + type: b + device: VIRTUAL-DISK + driver: sd + driver_module: sd_mod + model: IET VIRTUAL-DISK + old_unique_key: K1ot.XFis0A0w1l6 + resource: + disk_log_geo: + - cylinders: 20480 + heads: 64 + sectors: 32 + size: + - unit: sectors + x: 41943080 + y: 512 + rev: '0001' + sub_class_id: 0 + sysfs_bus_id: 1:0:0:1 + sysfs_id: "/class/block/sdc" + unique_key: _R2u.eVSycZhnQ60 + vendor: IET diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-4.2.3/test/zfcp_controller_test.rb new/yast2-s390-4.2.4/test/zfcp_controller_test.rb --- old/yast2-s390-4.2.3/test/zfcp_controller_test.rb 2019-12-11 15:45:25.000000000 +0100 +++ new/yast2-s390-4.2.4/test/zfcp_controller_test.rb 2020-03-23 15:07:39.000000000 +0100 @@ -87,11 +87,13 @@ end describe "#ProbeDisks" do - it "Probing disk" do - expect(Yast::SCR).to receive(:Read).with(Yast.path(".probe.disk")).once + before do + allow(Yast::SCR).to receive(:Read).with(Yast.path(".probe.disk")).once .and_return(load_data("probe_disk.yml")) - expect(Yast::SCR).to receive(:Read).with(Yast.path(".probe.tape")).once.and_return([]) + allow(Yast::SCR).to receive(:Read).with(Yast.path(".probe.tape")).once.and_return([]) + end + it "Probing disk" do expect(Yast::ZFCPController.ProbeDisks()).to eq(nil) expect(Yast::ZFCPController.devices).to eq(load_data("device_list.yml")) end
