February 2014 - YaST Commits - openSUSE Mailing Lists

[yast-commit] [ci_new_pac] JFYI yast2-s390 -> sle12
by ro 13 Feb '14

13 Feb '14

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(a)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(a)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(a)suse.de + +- fixed DASD probing (bnc#860398) +- 3.1.5 + +------------------------------------------------------------------- Wed Feb 5 12:44:00 UTC 2014 - jsrain(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [ci_new_pac] JFYI autoyast2 -> sle12
by ro 13 Feb '14

13 Feb '14

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/autoyast2 -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/autoyast2/autoyast2.changes 2014-02-11 14:59:47.000000000 +0100 +++ /mounts/work_src_done/SLE12/autoyast2/autoyast2.changes 2014-02-13 12:22:35.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Feb 13 12:16:37 CET 2014 - fehr(a)suse.de + +- Put current state of documentation from doc team into package +- 3.1.16 + +------------------------------------------------------------------- +Wed Feb 12 18:28:16 CET 2014 - fehr(a)suse.de + +- Use ruby sort to make autoyast partition default order like it + was in pre-ruby times +- 3.1.15 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - autoyast2 - yast2-product-creator ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/autoyast2 (Old) and /mounts/work_src_done/SLE12/autoyast2 (BS:build ID:32577 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2", Maintainer is "yast-commit(a)opensuse.org" Old: ---- autoyast2-3.1.14.tar.bz2 New: ---- autoyast2-3.1.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.7kjptm/_old 2014-02-13 12:53:38.000000000 +0100 +++ /var/tmp/diff_new_pack.7kjptm/_new 2014-02-13 12:53:38.000000000 +0100 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.14 +Version: 3.1.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.14.tar.bz2 -> autoyast2-3.1.16.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.14/package/autoyast2.changes new/autoyast2-3.1.16/package/autoyast2.changes --- old/autoyast2-3.1.14/package/autoyast2.changes 2014-02-10 17:15:19.000000000 +0100 +++ new/autoyast2-3.1.16/package/autoyast2.changes 2014-02-13 12:20:15.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu Feb 13 12:16:37 CET 2014 - fehr(a)suse.de + +- Put current state of documentation from doc team into package +- 3.1.16 + +------------------------------------------------------------------- +Wed Feb 12 18:28:16 CET 2014 - fehr(a)suse.de + +- Use ruby sort to make autoyast partition default order like it + was in pre-ruby times +- 3.1.15 + +------------------------------------------------------------------- Mon Feb 10 15:52:04 CET 2014 - locilka(a)suse.com - Fixed dependency on yast2-services-manager (>= 0.0.13) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.14/package/autoyast2.spec new/autoyast2-3.1.16/package/autoyast2.spec --- old/autoyast2-3.1.14/package/autoyast2.spec 2014-02-10 17:15:19.000000000 +0100 +++ new/autoyast2-3.1.16/package/autoyast2.spec 2014-02-13 12:20:15.000000000 +0100 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.14 +Version: 3.1.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Files old/autoyast2-3.1.14/package/autoyast_en_html.tar.bz2 and new/autoyast2-3.1.16/package/autoyast_en_html.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.14/src/modules/AutoinstStorage.rb new/autoyast2-3.1.16/src/modules/AutoinstStorage.rb --- old/autoyast2-3.1.14/src/modules/AutoinstStorage.rb 2014-02-10 17:15:19.000000000 +0100 +++ new/autoyast2-3.1.16/src/modules/AutoinstStorage.rb 2014-02-13 12:20:15.000000000 +0100 @@ -702,16 +702,9 @@ Builtins.y2milestone("entering Import with %1", settings) if Mode.autoinst settings = Builtins.maplist(settings) do |d| - Ops.set( - d, - "partitions", - Builtins.sort(Ops.get_list(d, "partitions", [])) do |x, y| - Ops.less_than( - Ops.get_integer(x, "partition_nr", 99), - Ops.get_integer(y, "partition_nr", 99) - ) - end - ) + d["partitions"] = d.fetch("partitions",[]).sort do |x, y| + x.fetch("partition_nr",99)<=>y.fetch("partition_nr",99) + end deep_copy(d) end ++++++ autoyast_en_html.tar.bz2 ++++++ ++++ 3873 lines of diff (skipped) continue with "q"... Checked in at Thu Feb 13 12:54:30 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 32577 changed to accepted (submit SUSE:SLE-12:GA/autoyast2)
by Ruediger Oertel 13 Feb '14

13 Feb '14

Visit https://build.suse.de/request/show/32577 State of request 32577 was changed by oertel: new -> accepted Comment: Accepted submit request 32577 from user leonardocf Actions: - submit Devel:YaST:Head/autoyast2 => SUSE:SLE-12:GA/autoyast2 -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [yast/yast-ldap] fa9514: Clean up Yast::Ldap module.
by GitHub 13 Feb '14

13 Feb '14

Branch: refs/heads/master Home: https://github.com/yast/yast-ldap Commit: fa95148ca79c13cededc088d744e2760dd16116e https://github.com/yast/yast-ldap/commit/fa95148ca79c13cededc088d744e2760dd… Author: Peter Varkoly <varkoly(a)suse.de> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M conf/Makefile.am M src/Ldap.rb M src/ldap_browser.rb Log Message: ----------- Clean up Yast::Ldap module. Commit: a9c8333de557d0937d5d141b1d69b4815d75f221 https://github.com/yast/yast-ldap/commit/a9c8333de557d0937d5d141b1d69b4815d… Author: Peter Varkoly <varkoly(a)suse.de> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: A conf/ldap_conf.scr Log Message: ----------- To modify /etc/openldap/ldap.conf is the job of this module Commit: 0bdc01a8e3a1116954ee70ed8427c410a00f3c98 https://github.com/yast/yast-ldap/commit/0bdc01a8e3a1116954ee70ed8427c410a0… Author: Peter Varkoly <varkoly(a)suse.de> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: A conf/cfg_ldap.scr M package/yast2-ldap.changes M package/yast2-ldap.spec Log Message: ----------- Merge remote-tracking branch 'upstream/master' Conflicts: conf/Makefile.am Commit: fca2c90a706f8560488200f17df02219f738febb https://github.com/yast/yast-ldap/commit/fca2c90a706f8560488200f17df02219f7… Author: Peter Varkoly <varkoly(a)suse.de> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: R conf/cfg_ldap.scr Log Message: ----------- We do not need thes file any more. Everything we need is saved in /etc/openldap/ldap.conf Commit: 1f693e4ea1968b19c2b78aef5f69fd7644e91c32 https://github.com/yast/yast-ldap/commit/1f693e4ea1968b19c2b78aef5f69fd7644… Author: Peter Varkoly <varkoly(a)suse.com> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M conf/Makefile.am Log Message: ----------- Fix the make file Commit: 578b5a38d28ac3709ae2e1d7d646fc5663120188 https://github.com/yast/yast-ldap/commit/578b5a38d28ac3709ae2e1d7d646fc5663… Author: Peter Varkoly <varkoly(a)suse.com> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M package/yast2-ldap.changes M package/yast2-ldap.spec Log Message: ----------- Increase version. Commit: d98434589a976421d01d7a4e5c71aba3da254483 https://github.com/yast/yast-ldap/commit/d98434589a976421d01d7a4e5c71aba3da… Author: Peter Varkoly <varkoly(a)suse.de> Date: 2014-02-13 (Thu, 13 Feb 2014) Changed paths: M conf/Makefile.am M package/yast2-ldap.spec M src/Ldap.rb Log Message: ----------- Adapt suggestions of Josef Reidinger Commit: 3d65216d42707b07dbcf35360d5826aa5d3dbc00 https://github.com/yast/yast-ldap/commit/3d65216d42707b07dbcf35360d5826aa5d… Author: Peter Varkoly <varkoly(a)suse.de> Date: 2014-02-13 (Thu, 13 Feb 2014) Changed paths: M package/yast2-ldap.changes M package/yast2-ldap.spec Log Message: ----------- Merge branch 'master' of github.com:varkoly/yast-ldap Commit: e2a4a6d5b41b512feab6130e49a8cb51ed4df425 https://github.com/yast/yast-ldap/commit/e2a4a6d5b41b512feab6130e49a8cb51ed… Author: Peter Varkoly <varkoly(a)suse.de> Date: 2014-02-13 (Thu, 13 Feb 2014) Changed paths: M package/yast2-ldap.changes Log Message: ----------- BNC#863612 YaST reports Cannot find client ldap/routines.rb Commit: 9dde5f42a1e1f2f8b83b39e47f01dfe5641cd309 https://github.com/yast/yast-ldap/commit/9dde5f42a1e1f2f8b83b39e47f01dfe564… Author: Peter Varkoly <varkoly(a)suse.de> Date: 2014-02-13 (Thu, 13 Feb 2014) Changed paths: M conf/Makefile.am R conf/cfg_ldap.scr A conf/ldap_conf.scr M package/yast2-ldap.changes M package/yast2-ldap.spec M src/Ldap.rb M src/ldap_browser.rb Log Message: ----------- Merge pull request #11 from varkoly/master Simplify Ldap.rb Compare: https://github.com/yast/yast-ldap/compare/5c7181778fc0...9dde5f42a1e1

1 0

[yast-commit] [yast/yast-users] bcfad0: BNC#863612 YaST reports Cannot find client ldap/ro...
by GitHub 13 Feb '14

13 Feb '14

Branch: refs/heads/master Home: https://github.com/yast/yast-users Commit: bcfad0cd183372a7806b0007310ff8313695fbfb https://github.com/yast/yast-users/commit/bcfad0cd183372a7806b0007310ff8313… Author: Peter Varkoly <varkoly(a)suse.de> Date: 2014-02-13 (Thu, 13 Feb 2014) Changed paths: M package/yast2-users.changes M package/yast2-users.spec M src/include/users/ldap_dialogs.rb Log Message: ----------- BNC#863612 YaST reports Cannot find client ldap/routines.rb Commit: 0a979f0a07e5e60d11bac802bdc97a3408735c32 https://github.com/yast/yast-users/commit/0a979f0a07e5e60d11bac802bdc97a340… Author: Peter Varkoly <varkoly(a)suse.de> Date: 2014-02-13 (Thu, 13 Feb 2014) Changed paths: M package/yast2-users.changes M package/yast2-users.spec M src/include/users/ldap_dialogs.rb Log Message: ----------- Merge pull request #33 from varkoly/master BNC#863612 YaST reports Cannot find client ldap/routines.rb Compare: https://github.com/yast/yast-users/compare/c807a8535140...0a979f0a07e5

1 0

[yast-commit] [yast/yast-autoinstallation] f79201: Put current state of documentation from doc team i...
by GitHub 13 Feb '14

13 Feb '14

Branch: refs/heads/master Home: https://github.com/yast/yast-autoinstallation Commit: f7920112084d8a47bf418f21c8aaf67b35057a1a https://github.com/yast/yast-autoinstallation/commit/f7920112084d8a47bf418f… Author: Thomas Fehr <fehr(a)suse.de> Date: 2014-02-13 (Thu, 13 Feb 2014) Changed paths: M package/autoyast_en_html.tar.bz2 Log Message: ----------- Put current state of documentation from doc team into package Commit: d402b347aab35e057e987c6240f0eec8a712c23c https://github.com/yast/yast-autoinstallation/commit/d402b347aab35e057e987c… Author: Thomas Fehr <fehr(a)suse.de> Date: 2014-02-13 (Thu, 13 Feb 2014) Changed paths: M package/autoyast2.changes Log Message: ----------- changelog entry Commit: e0c1e7f78cd8e8030808fd807e8851a951423984 https://github.com/yast/yast-autoinstallation/commit/e0c1e7f78cd8e8030808fd… Author: Thomas Fehr <fehr(a)suse.de> Date: 2014-02-13 (Thu, 13 Feb 2014) Changed paths: M package/autoyast2.changes M package/autoyast2.spec Log Message: ----------- version 3.1.16 Compare: https://github.com/yast/yast-autoinstallation/compare/082d67943035...e0c1e7…

1 0

[yast-commit] [yast/yast-autoinstallation] 49a454: Use ruby sort to make autoyast partition default o...
by GitHub 13 Feb '14

13 Feb '14

Branch: refs/heads/master Home: https://github.com/yast/yast-autoinstallation Commit: 49a45436e4b2d953ea4b71cac7d2cf8299dc817b https://github.com/yast/yast-autoinstallation/commit/49a45436e4b2d953ea4b71… Author: Thomas Fehr <fehr(a)suse.de> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M src/modules/AutoinstStorage.rb Log Message: ----------- Use ruby sort to make autoyast partition default order like it was in pre-ruby times Commit: 983985b412a4e69ffe5f5ea7c76cd0ca55bafcc3 https://github.com/yast/yast-autoinstallation/commit/983985b412a4e69ffe5f5e… Author: Thomas Fehr <fehr(a)suse.de> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M package/autoyast2.changes Log Message: ----------- changelog entry Commit: 605c85bb086fb6c1120812e84b74661bbdf17c98 https://github.com/yast/yast-autoinstallation/commit/605c85bb086fb6c1120812… Author: Thomas Fehr <fehr(a)suse.de> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M package/autoyast2.changes M package/autoyast2.spec Log Message: ----------- version 3.1.15 Commit: 082d67943035a46e99ed87ea85601052ebc14133 https://github.com/yast/yast-autoinstallation/commit/082d67943035a46e99ed87… Author: Thomas Fehr <fehr(a)suse.de> Date: 2014-02-13 (Thu, 13 Feb 2014) Changed paths: M package/autoyast2.changes M package/autoyast2.spec M src/modules/AutoinstStorage.rb Log Message: ----------- Merge pull request #31 from thomas-fehr/master fix change sort order of partitions without explicit partition number Compare: https://github.com/yast/yast-autoinstallation/compare/cb6759d41847...082d67…

1 0

[yast-commit] [libyui/libyui-qt-pkg] dc2331: Removed hard-coded background color
by GitHub 12 Feb '14

12 Feb '14

Branch: refs/heads/fix_colors Home: https://github.com/libyui/libyui-qt-pkg Commit: dc23310b0eab72860936d2307acf7ee26547410b https://github.com/libyui/libyui-qt-pkg/commit/dc23310b0eab72860936d2307acf… Author: Thomas Goettlicher <tgoettlicher(a)suse.de> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M src/YQPkgSelDescriptionView.cc Log Message: ----------- Removed hard-coded background color The hard-coded background color didn't allow to properly define the colors using stylesheets.

1 0

[yast-commit] [yast/yast-s390] dfb526: - cleanup and coding style
by GitHub 12 Feb '14

12 Feb '14

Branch: refs/heads/master Home: https://github.com/yast/yast-s390 Commit: dfb526d265384cac647bcf4fd6df2ee59ab6d480 https://github.com/yast/yast-s390/commit/dfb526d265384cac647bcf4fd6df2ee59a… Author: Arvin Schnell <aschnell(a)suse.de> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M src/clients/dasd_auto.rb M src/clients/zfcp_auto.rb M src/include/s390/dasd/wizards.rb M src/include/s390/zfcp/wizards.rb Log Message: ----------- - cleanup and coding style Commit: 0e69b65ffb2ab476d8db2935ed072d578938d563 https://github.com/yast/yast-s390/commit/0e69b65ffb2ab476d8db2935ed072d5789… Author: Arvin Schnell <aschnell(a)suse.de> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M package/yast2-s390.changes M package/yast2-s390.spec M src/include/s390/zfcp/wizards.rb M src/modules/DASDController.rb Log Message: ----------- - fixed DASD probing (bnc#860398) Commit: 4208d3221c2c48d80837af562795996ff3a4263c https://github.com/yast/yast-s390/commit/4208d3221c2c48d80837af562795996ff3… Author: Arvin Schnell <aschnell(a)suse.de> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M src/clients/inst_dasd.rb M src/clients/inst_zfcp.rb M src/include/s390/dasd/wizards.rb M src/include/s390/zfcp/wizards.rb Log Message: ----------- - moved Read calls Commit: 4653b716ad9b06d66c3e465d42ccadc0aaab885b https://github.com/yast/yast-s390/commit/4653b716ad9b06d66c3e465d42ccadc0aa… Author: Arvin Schnell <aschnell(a)suse.de> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M package/yast2-s390.changes M package/yast2-s390.spec M src/clients/dasd_auto.rb M src/clients/inst_dasd.rb M src/clients/inst_zfcp.rb M src/clients/zfcp_auto.rb M src/include/s390/dasd/wizards.rb M src/include/s390/zfcp/wizards.rb M src/modules/DASDController.rb Log Message: ----------- Merge pull request #8 from aschnell/master - fix, cleanup and coding style Compare: https://github.com/yast/yast-s390/compare/2eb522bec6ff...4653b716ad9b

1 0

[yast-commit] [ci_new_pac] JFYI yast2-registration -> sle12
by ro 12 Feb '14

12 Feb '14

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-registration -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-02-05 17:48:28.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-02-12 16:37:10.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 12 14:12:23 UTC 2014 - lslezak(a)suse.cz + +- pass the repository services returned by SCC to libzypp +- make /etc/zypp writable during installation +- 3.1.4 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-registration ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-registration (Old) and /mounts/work_src_done/SLE12/yast2-registration (BS:build ID:32541 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-registration-3.1.3.tar.bz2 New: ---- yast2-registration-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.pjvVDh/_old 2014-02-12 17:59:30.000000000 +0100 +++ /var/tmp/diff_new_pack.pjvVDh/_new 2014-02-12 17:59:30.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.3.tar.bz2 -> yast2-registration-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.3/package/yast2-registration.changes new/yast2-registration-3.1.4/package/yast2-registration.changes --- old/yast2-registration-3.1.3/package/yast2-registration.changes 2014-02-04 18:10:36.000000000 +0100 +++ new/yast2-registration-3.1.4/package/yast2-registration.changes 2014-02-12 16:35:22.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 12 14:12:23 UTC 2014 - lslezak(a)suse.cz + +- pass the repository services returned by SCC to libzypp +- make /etc/zypp writable during installation +- 3.1.4 + +------------------------------------------------------------------- Mon Feb 3 20:00:19 UTC 2014 - lslezak(a)suse.cz - use scc_api gem for communication with SCC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.3/package/yast2-registration.spec new/yast2-registration-3.1.4/package/yast2-registration.spec --- old/yast2-registration-3.1.3/package/yast2-registration.spec 2014-02-04 18:10:36.000000000 +0100 +++ new/yast2-registration-3.1.4/package/yast2-registration.spec 2014-02-12 16:35:22.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.3/src/clients/inst_scc.rb new/yast2-registration-3.1.4/src/clients/inst_scc.rb --- old/yast2-registration-3.1.3/src/clients/inst_scc.rb 2014-02-04 18:10:36.000000000 +0100 +++ new/yast2-registration-3.1.4/src/clients/inst_scc.rb 2014-02-12 16:35:22.000000000 +0100 @@ -25,10 +25,15 @@ # use external rubygem for SCC communication require "scc_api" +require "tmpdir" +require "fileutils" + module Yast class InstSccClient < Client include Yast::Logger + ZYPP_DIR = "/etc/zypp" + def main Yast.import "UI" Yast.import "Pkg" @@ -80,28 +85,46 @@ scc = SccApi::Connection.new(email, reg_code) # announce (register the system) first - begin - Popup.ShowFeedback(_("Registering the System..."), _("Contacting the SUSE Customer Center server")) - result = scc.announce - ensure - Popup.ClearFeedback + credentials = run_with_feedback(_("Registering the System..."), _("Contacting the SUSE Customer Center server")) do + scc.announce end - # then register the product(s) - begin - Popup.ShowFeedback(_("Registering the Product..."), _("Contacting the SUSE Customer Center server")) + # ensure the zypp config directories are writable in inst-sys + ensure_zypp_config_writable + + # write the global credentials + credentials.write + # then register the product(s) + product_services = run_with_feedback(_("Registering the Product..."), _("Contacting the SUSE Customer Center server")) do # there will be just one base product, but theoretically there can be more... - selected_base_products.each do |base_product| + selected_base_products.map do |base_product| log.info("Registering base product: #{base_product.inspect}") - result = scc.register(base_product) + scc.register(base_product) + end + end - # TODO: remove this - # Popup.Message("SCC response:\n#{JSON.pretty_generate(result)}") - Popup.Message("The system has been registered.") + add_services(product_services, credentials) + end + + # add the services to libzypp and load (refresh) them + def add_services(product_services, credentials) + # each registered product + product_services.each do |product_service| + # services for the each product + product_service.services.each do |service| + log.info "Adding service #{service.name.inspect} (#{service.url})" + + # TODO FIXME: SCC currenly does not return credentials for the service, + # just reuse the global credentials and save to a different file + credentials.file = service.name + "_credentials" + credentials.write + + Pkg.ServiceAdd(service.name, service.url.to_s) + # refresh works only for saved services + Pkg.ServiceSave(service.name) + Pkg.ServiceRefresh(service.name) end - ensure - Popup.ClearFeedback end end @@ -137,7 +160,8 @@ end def selected_base_products - # just for debugging: return [{"name" => "SUSE_SLES", "arch" => "x86_64", "version" => "12"}] + # just for debugging: + # return [{"name" => "SUSE_SLES", "arch" => "x86_64", "version" => "12-"}] # source 0 is the base installation repo, the repos added later are considered as add-ons # although they can also contain a different base product @@ -153,6 +177,32 @@ product_info end + def run_with_feedback(header, label, &block) + Popup.ShowFeedback(header, label) + yield + ensure + Popup.ClearFeedback + end + + # during installation /etc/zypp directory is not writable (mounted on + # a read-only file system), the workaround is to copy the whole directory + # structure into a writable temporary directory and override the original + # location by "mount -o bind" + def ensure_zypp_config_writable + if Mode.installation && !File.writable?(ZYPP_DIR) + log.info "Copying libzypp config to a writable place" + + # create writable zypp directory structure in /tmp + tmpdir = Dir.mktmpdir + + log.info "Copying #{ZYPP_DIR} to #{tmpdir} ..." + ::FileUtils.cp_r ZYPP_DIR, tmpdir + + log.info "Mounting #{tmpdir} to #{ZYPP_DIR}" + `mount -o bind #{tmpdir} #{ZYPP_DIR}` + end + end + end end continue with "q"... Checked in at Wed Feb 12 17:59:37 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0