Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-s390 -> sle12 ## BNC# 860398 : "YaST doesn't detect DASD during installation" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-s390/yast2-s390.changes 2014-02-07 16:23:38.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-s390/yast2-s390.changes 2014-02-12 18:36:15.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 12 15:17:53 CET 2014 - aschnell@suse.de + +- fixed DASD probing (bnc#860398) +- 3.1.5 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-s390 (Old) and /mounts/work_src_done/SLE12/yast2-s390 (BS:build ID:32552 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-s390", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-s390-3.1.4.tar.bz2 New: ---- yast2-s390-3.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-s390.spec ++++++ --- /var/tmp/diff_new_pack.MmcWA1/_old 2014-02-13 13:15:39.000000000 +0100 +++ /var/tmp/diff_new_pack.MmcWA1/_new 2014-02-13 13:15:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-s390 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,11 +28,12 @@ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files BuildRequires: yast2 yast2-testsuite yast2-users yast2-bootloader BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: yast2-ruby-bindings >= 3.1.7 +BuildRequires: rubygem-rspec ExclusiveArch: s390 s390x -Requires: yast2 s390-tools - -Requires: yast2-ruby-bindings >= 1.0.0 - +Requires: yast2 +Requires: yast2-ruby-bindings >= 3.1.7 +Requires: s390-tools Summary: YaST2 - S/390 Specific Features Configuration %description ++++++ yast2-s390-3.1.4.tar.bz2 -> yast2-s390-3.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.4/package/yast2-s390.changes new/yast2-s390-3.1.5/package/yast2-s390.changes --- old/yast2-s390-3.1.4/package/yast2-s390.changes 2014-02-06 12:45:33.000000000 +0100 +++ new/yast2-s390-3.1.5/package/yast2-s390.changes 2014-02-12 18:35:22.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 12 15:17:53 CET 2014 - aschnell@suse.de + +- fixed DASD probing (bnc#860398) +- 3.1.5 + +------------------------------------------------------------------- Wed Feb 5 12:44:00 UTC 2014 - jsrain@suse.cz - enhanced unformatted disks handling during activation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.4/package/yast2-s390.spec new/yast2-s390-3.1.5/package/yast2-s390.spec --- old/yast2-s390-3.1.4/package/yast2-s390.spec 2014-02-06 12:45:33.000000000 +0100 +++ new/yast2-s390-3.1.5/package/yast2-s390.spec 2014-02-12 18:35:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-s390 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,11 +28,12 @@ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files BuildRequires: yast2 yast2-testsuite yast2-users yast2-bootloader BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: yast2-ruby-bindings >= 3.1.7 +BuildRequires: rubygem-rspec ExclusiveArch: s390 s390x -Requires: yast2 s390-tools - -Requires: yast2-ruby-bindings >= 1.0.0 - +Requires: yast2 +Requires: yast2-ruby-bindings >= 3.1.7 +Requires: s390-tools Summary: YaST2 - S/390 Specific Features Configuration %description diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.4/src/clients/dasd_auto.rb new/yast2-s390-3.1.5/src/clients/dasd_auto.rb --- old/yast2-s390-3.1.4/src/clients/dasd_auto.rb 2014-02-06 12:45:33.000000000 +0100 +++ new/yast2-s390-3.1.5/src/clients/dasd_auto.rb 2014-02-12 18:35:22.000000000 +0100 @@ -24,8 +24,6 @@ # Summary: Client for autoinstallation # Authors: Jiri Srain <jsrain@suse.cz> # -# $Id$ -# # This is a client for autoinstallation. It takes its arguments, # goes through the configuration and return the setting. # Does not do any changes to the configuration. @@ -55,6 +53,7 @@ @param = Convert.to_map(WFM.Args(1)) end end + Builtins.y2debug("func=%1", @func) Builtins.y2debug("param=%1", @param) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.4/src/clients/inst_dasd.rb new/yast2-s390-3.1.5/src/clients/inst_dasd.rb --- old/yast2-s390-3.1.4/src/clients/inst_dasd.rb 2014-02-06 12:45:33.000000000 +0100 +++ new/yast2-s390-3.1.5/src/clients/inst_dasd.rb 2014-02-12 18:35:22.000000000 +0100 @@ -1,6 +1,6 @@ # encoding: utf-8 -# Copyright (c) 2012 Novell, Inc. +# Copyright (c) [2012-2014] Novell, Inc. # # All Rights Reserved. # @@ -24,8 +24,6 @@ # Summary: Main file # Authors: Jiri Srain <jsrain@suse.cz> # -# $Id$ -# # Main file for controller configuration. Uses all other files. module Yast class InstDasdClient < Client @@ -38,6 +36,7 @@ Yast.include self, "s390/dasd/wizards.rb" + DASDController.Read() @ret = MainDASDSequence() Builtins.y2debug("ret=%1", @ret) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.4/src/clients/inst_zfcp.rb new/yast2-s390-3.1.5/src/clients/inst_zfcp.rb --- old/yast2-s390-3.1.4/src/clients/inst_zfcp.rb 2014-02-06 12:45:33.000000000 +0100 +++ new/yast2-s390-3.1.5/src/clients/inst_zfcp.rb 2014-02-12 18:35:22.000000000 +0100 @@ -1,6 +1,6 @@ # encoding: utf-8 -# Copyright (c) 2012 Novell, Inc. +# Copyright (c) [2012-2014] Novell, Inc. # # All Rights Reserved. # @@ -24,8 +24,6 @@ # Summary: Main file # Authors: Jiri Srain <jsrain@suse.cz> # -# $Id$ -# # Main file for controller configuration. Uses all other files. module Yast class InstZfcpClient < Client @@ -38,6 +36,7 @@ Yast.include self, "s390/zfcp/wizards.rb" + ZFCPController.Read() @ret = MainZFCPSequence() Builtins.y2debug("ret=%1", @ret) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.4/src/clients/zfcp_auto.rb new/yast2-s390-3.1.5/src/clients/zfcp_auto.rb --- old/yast2-s390-3.1.4/src/clients/zfcp_auto.rb 2014-02-06 12:45:33.000000000 +0100 +++ new/yast2-s390-3.1.5/src/clients/zfcp_auto.rb 2014-02-12 18:35:22.000000000 +0100 @@ -24,8 +24,6 @@ # Summary: Client for autoinstallation # Authors: Jiri Srain <jsrain@suse.cz> # -# $Id$ -# # This is a client for autoinstallation. It takes its arguments, # goes through the configuration and return the setting. # Does not do any changes to the configuration. @@ -55,6 +53,7 @@ @param = Convert.to_map(WFM.Args(1)) end end + Builtins.y2debug("func=%1", @func) Builtins.y2debug("param=%1", @param) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.4/src/include/s390/dasd/wizards.rb new/yast2-s390-3.1.5/src/include/s390/dasd/wizards.rb --- old/yast2-s390-3.1.4/src/include/s390/dasd/wizards.rb 2014-02-06 12:45:33.000000000 +0100 +++ new/yast2-s390-3.1.5/src/include/s390/dasd/wizards.rb 2014-02-12 18:35:22.000000000 +0100 @@ -24,7 +24,6 @@ # Summary: Wizards definitions # Authors: Jiri Srain <jsrain@suse.cz> # -# $Id$ module Yast module S390DasdWizardsInclude @@ -62,7 +61,6 @@ "delete" => { :abort => :abort, :next => "main" } } - DASDController.Read() Sequencer.Run(aliases, sequence) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.4/src/include/s390/zfcp/wizards.rb new/yast2-s390-3.1.5/src/include/s390/zfcp/wizards.rb --- old/yast2-s390-3.1.4/src/include/s390/zfcp/wizards.rb 2014-02-06 12:45:33.000000000 +0100 +++ new/yast2-s390-3.1.5/src/include/s390/zfcp/wizards.rb 2014-02-12 18:35:22.000000000 +0100 @@ -1,6 +1,6 @@ # encoding: utf-8 -# Copyright (c) 2012 Novell, Inc. +# Copyright (c) [2012-2014] Novell, Inc. # # All Rights Reserved. # @@ -24,7 +24,6 @@ # Summary: Wizards definitions # Authors: Jiri Srain <jsrain@suse.cz> # -# $Id$ module Yast module S390ZfcpWizardsInclude def initialize_s390_zfcp_wizards(include_target) @@ -40,12 +39,11 @@ # Main dialog # @return [Symbol] dialog def MainZFCPSequence - aliases = { "main" => lambda { ZFCPDialog() }, "add" => lambda do - AddZFCPDiskDialog() - end, "delete" => lambda( - ) do - DeleteZFCPDiskDialog() - end } + aliases = { + "main" => lambda { ZFCPDialog() }, + "add" => lambda { AddZFCPDiskDialog() }, + "delete" => lambda { DeleteZFCPDiskDialog() } + } sequence = { "ws_start" => "main", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.4/src/modules/DASDController.rb new/yast2-s390-3.1.5/src/modules/DASDController.rb --- old/yast2-s390-3.1.4/src/modules/DASDController.rb 2014-02-06 12:45:33.000000000 +0100 +++ new/yast2-s390-3.1.5/src/modules/DASDController.rb 2014-02-12 18:35:22.000000000 +0100 @@ -1,6 +1,6 @@ # encoding: utf-8 -# Copyright (c) 2012 Novell, Inc. +# Copyright (c) [2012-2014] Novell, Inc. # # All Rights Reserved. # @@ -32,6 +32,11 @@ module Yast class DASDControllerClass < Module + + + include Yast::Logger + + def main Yast.import "UI" textdomain "s390" @@ -78,13 +83,6 @@ end - # Is this kind of disk controller available? - # @return [Boolean] true if it is - def Available - true - end - - def GetDeviceName(channel) dir = Builtins.sformat("/sys/bus/ccw/devices/%1/block/", channel) files = Convert.convert( @@ -117,10 +115,6 @@ ProbeDisks() if !Mode.normal - @devices = Builtins.filter(@devices) do |index, d| - Ops.get_boolean(d, ["resource", "io", 0, "active"], false) - end - @devices = Builtins.mapmap(@devices) do |index, d| Ops.set(d, "format", Ops.get_boolean(d, "format", false)) Ops.set(d, "diag", Ops.get_boolean(d, "diag", false)) @@ -359,19 +353,10 @@ # Check if DASD subsystem is available # @return [Boolean] True if more than one disk def IsAvailable - disks = Convert.convert( - SCR.Read(path(".probe.disk")), - :from => "any", - :to => "list <map <string, any>>" - ) - disks = Builtins.filter(disks) do |d| - Builtins.tolower(Ops.get_string(d, "device", "")) == "dasd" - end - - count = Builtins.size(disks) - Builtins.y2milestone("number of probed DASD devices %1", count) - - Ops.greater_than(count, 0) + disks = SCR.Read(path(".probe.disk")) + count = disks.count { |d| d["device"] == "DASD" } + log.info("number of probed DASD devices #{count}") + return count > 0 end @@ -821,7 +806,6 @@ publish :function => :GetModified, :type => "boolean ()" publish :variable => :proposal_valid, :type => "boolean" publish :function => :SetModified, :type => "void (boolean)" - publish :function => :Available, :type => "boolean ()" publish :function => :IsValidChannel, :type => "boolean (string)" publish :function => :FormatChannel, :type => "string (string)" publish :function => :Read, :type => "boolean ()" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.4/src/modules/ZFCPController.rb new/yast2-s390-3.1.5/src/modules/ZFCPController.rb --- old/yast2-s390-3.1.4/src/modules/ZFCPController.rb 2014-02-06 12:45:33.000000000 +0100 +++ new/yast2-s390-3.1.5/src/modules/ZFCPController.rb 2014-02-12 18:35:22.000000000 +0100 @@ -78,13 +78,6 @@ end - # Is this kind of disk controller available? - # @return [Boolean] true if it is - def Available - true - end - - def IsValidChannel(channel) regexp = "^([[:xdigit:]]{1}).([[:xdigit:]]{1}).([[:xdigit:]]{4})$" Builtins.regexpmatch(channel, regexp) @@ -698,7 +691,6 @@ publish :variable => :modified, :type => "boolean" publish :variable => :proposal_valid, :type => "boolean" publish :function => :SetModified, :type => "void (boolean)" - publish :function => :Available, :type => "boolean ()" publish :function => :IsValidChannel, :type => "boolean (string)" publish :function => :FormatChannel, :type => "string (string)" publish :function => :IsValidWWPN, :type => "boolean (string)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.4/test/Makefile.am new/yast2-s390-3.1.5/test/Makefile.am --- old/yast2-s390-3.1.4/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-s390-3.1.5/test/Makefile.am 2014-02-12 18:35:22.000000000 +0100 @@ -0,0 +1,11 @@ +# +# Makefile.am for s390/test +# + +TESTS = dasd_controller_is_available_test.rb + +TEST_EXTENSIONS = .rb +RB_LOG_COMPILER = rspec +VERBOSE = 1 +EXTRA_DIST = $(TESTS) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.4/test/dasd_controller_is_available_test.rb new/yast2-s390-3.1.5/test/dasd_controller_is_available_test.rb --- old/yast2-s390-3.1.4/test/dasd_controller_is_available_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-s390-3.1.5/test/dasd_controller_is_available_test.rb 2014-02-12 18:35:22.000000000 +0100 @@ -0,0 +1,36 @@ +#!/usr/bin/rspec + +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) + +require "yast" +include Yast + +Yast.import "DASDController" + + +describe "DASDController#IsAvailable" do + + + it "returns true if .probe.disk contains DASDs" do + + data = [ + { "bus" => "CCW", "bus_hwcfg" => "ccw", "class_id" => 262, "detail" => { + "cu_model" => 233, "dev_model" => 10, "lcss" => 0 }, "device" => "DASD", + "device_id" => 276880, "drivers" => [ { "active" => true, "modprobe" => + true, "modules" => [ [ "dasd_eckd_mod", "" ] ] } ], "model" => "IBM + DASD", "old_unique_key" => "amWp.rOENMk3aQ50", "prog_if" => 1, + "resource" => { "io" => [ { "active" => false, "length" => 1, "mode" => + "rw", "start" => 352 } ] }, "sub_class_id" => 0, "sub_device_id" => + 275344, "sysfs_bus_id" => "0.0.0160", "sysfs_id" => + "/devices/css0/0.0.0001/0.0.0160", "unique_key" => "3VmV.ALFATSt_U8F", + "vendor" => "IBM", "vendor_id" => 286721 } + ] + + Yast::SCR.stub(:Read).with(path(".probe.disk")).once.and_return(data) + + expect(Yast::DASDController.IsAvailable()).to be_true + + end + + +end continue with "q"... Checked in at Thu Feb 13 13:16:39 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org