Mailinglist Archive: yast-devel (224 mails)

< Previous Next >
[yast-devel] [ci_new_pac] JFYI yast2-s390 -> sle12
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




Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-s390/yast2-s390.changes 2014-01-17
14:16:33.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-s390/yast2-s390.changes 2014-01-27
10:01:17.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Jan 23 11:17:15 UTC 2014 - jsrain@xxxxxxx
+
+- enhanced handling of large amount of disks (fate#313402,
+ fate#313403, fate#315984)
+- 3.1.2
+
+-------------------------------------------------------------------

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:31179
MAIL:yast-devel@xxxxxxxxxxxx) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-s390", Maintainer is "yast-devel@xxxxxxxxxxxx"


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

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

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

Other differences:
------------------
++++++ yast2-s390.spec ++++++
--- /var/tmp/diff_new_pack.hyMPvw/_old 2014-01-27 12:29:20.000000000 +0100
+++ /var/tmp/diff_new_pack.hyMPvw/_new 2014-01-27 12:29:20.000000000 +0100
@@ -17,32 +17,23 @@


Name: yast2-s390
-Version: 3.1.1
+Version: 3.1.2
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2

-BuildRequires: docbook-xsl-stylesheets
-BuildRequires: doxygen
-BuildRequires: libxslt
-BuildRequires: perl-XML-Writer
-BuildRequires: sgml-skel
-BuildRequires: update-desktop-files
-BuildRequires: yast2
-BuildRequires: yast2-bootloader
-BuildRequires: yast2-devtools >= 3.0.6
-BuildRequires: yast2-testsuite
-BuildRequires: yast2-users
+Group: System/YaST
+License: GPL-2.0
+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
ExclusiveArch: s390 s390x
-Requires: s390-tools
-Requires: yast2
+Requires: yast2 s390-tools

Requires: yast2-ruby-bindings >= 1.0.0

Summary: YaST2 - S/390 Specific Features Configuration
-License: GPL-2.0
-Group: System/YaST

%description
This package contains the YaST component for configuration of
@@ -57,6 +48,7 @@
%install
%yast_install

+
%files
%defattr(-,root,root)
%dir %{yast_yncludedir}/s390
@@ -67,5 +59,3 @@
%{yast_desktopdir}/*.desktop
%{yast_schemadir}/autoyast/rnc/*.rnc
%doc %{yast_docdir}
-
-%changelog

++++++ yast2-s390-3.1.1.tar.bz2 -> yast2-s390-3.1.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-s390-3.1.1/VERSION new/yast2-s390-3.1.2/VERSION
--- old/yast2-s390-3.1.1/VERSION 2013-12-09 12:51:24.000000000 +0100
+++ new/yast2-s390-3.1.2/VERSION 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-3.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-s390-3.1.1/package/yast2-s390.changes
new/yast2-s390-3.1.2/package/yast2-s390.changes
--- old/yast2-s390-3.1.1/package/yast2-s390.changes 2013-12-09
12:51:24.000000000 +0100
+++ new/yast2-s390-3.1.2/package/yast2-s390.changes 2014-01-24
10:00:53.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Jan 23 11:17:15 UTC 2014 - jsrain@xxxxxxx
+
+- enhanced handling of large amount of disks (fate#313402,
+ fate#313403, fate#315984)
+- 3.1.2
+
+-------------------------------------------------------------------
Mon Dec 9 10:28:47 UTC 2013 - jreidinger@xxxxxxxx

- add COPYING to fix building
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-s390-3.1.1/package/yast2-s390.spec
new/yast2-s390-3.1.2/package/yast2-s390.spec
--- old/yast2-s390-3.1.1/package/yast2-s390.spec 2013-12-09
12:51:24.000000000 +0100
+++ new/yast2-s390-3.1.2/package/yast2-s390.spec 2014-01-24
10:00:53.000000000 +0100
@@ -17,7 +17,7 @@


Name: yast2-s390
-Version: 3.1.1
+Version: 3.1.2
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -27,7 +27,7 @@
License: GPL-2.0
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.0.6
+BuildRequires: yast2-devtools >= 3.1.10
ExclusiveArch: s390 s390x
Requires: yast2 s390-tools

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-s390-3.1.1/src/autoyast-rnc/dasd.rnc
new/yast2-s390-3.1.2/src/autoyast-rnc/dasd.rnc
--- old/yast2-s390-3.1.1/src/autoyast-rnc/dasd.rnc 2013-12-09
12:51:24.000000000 +0100
+++ new/yast2-s390-3.1.2/src/autoyast-rnc/dasd.rnc 2014-01-24
10:00:53.000000000 +0100
@@ -10,5 +10,6 @@
element format { BOOLEAN }? &
element diag { BOOLEAN }?
}*
- }?
+ }? &
+ element format_unformatted { BOOLEAN }?
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-s390-3.1.1/src/include/s390/dasd/dialogs.rb
new/yast2-s390-3.1.2/src/include/s390/dasd/dialogs.rb
--- old/yast2-s390-3.1.1/src/include/s390/dasd/dialogs.rb 2013-12-09
12:51:24.000000000 +0100
+++ new/yast2-s390-3.1.2/src/include/s390/dasd/dialogs.rb 2014-01-27
10:00:49.000000000 +0100
@@ -205,6 +205,7 @@
case action
when :activate, :deactivate
value = action == :activate
+ unformatted_disks = []

Builtins.foreach(selected) do |id|
channel = Ops.get_string(
@@ -212,13 +213,42 @@
[id, "channel"],
""
)
+ act_ret = 0
diag = Ops.get(DASDController.diag, channel, false)
if value
- DASDController.ActivateDisk(channel, diag)
+ act_ret = DASDController.ActivateDisk(channel, diag)
else
DASDController.DeactivateDisk(channel, diag)
end
+ if act_ret == 8 # 8 means disk is not formatted
+ unformatted_disks << channel
+ end
end
+ if unformatted_disks.size > 0
+ if unformatted_disks.size == 1
+ popup = Builtins.sformat(_("Device %1 is not formatted. Format
device now?"), unformatted_disks[0])
+ else
+ popup = BUiltins.sformat(_("There are %1 unformatted devices.
Format them now?"), unformatted_sisks.size)
+ end
+ # for autoinst, format unformatted disks later
+ if (! Mode.autoinst) && Popup.ContinueCancel(popup)
+ unformatted_disks.each do | channel |
+ #FIXME: possibly disks can be formatted in parallel
+ cmd = "ls '/sys/bus/ccw/devices/#{channel}/block/' | tr -d
'\n'"
+ disk = SCR.Execute(path(".target.bash_output"), cmd)
+ if disk["exit"] == 0 && !disk["stdout"].empty?
+ DASDController.FormatDisks(
+ ["/dev/#{disk["stdout"]}"],
+ 1
+ )
+ diag = !!DASDController.diag[channel]
+ DASDController.ActivateDisk(channel, diag)
+ else
+ Popup.Error( Builtins.sformat("Couldn't find device for %1
channel", channel))
+ end
+ end
+ end
+ end
DASDController.ProbeDisks

return true
@@ -430,6 +460,8 @@
MenuButton(Id(:operation), _("Perform &Action"), PossibleActions())
) :
HBox(
+ PushButton(Id(:select_all), _("&Select All")),
+ PushButton(Id(:deselect_all), _("&Deselect All")),
HStretch(),
# menu button
MenuButton(Id(:operation), _("Perform &Action"), PossibleActions())
@@ -485,7 +517,15 @@

ret = Ops.get_symbol(event, "ID")

- if ret == :filter
+ if ret == :select_all
+
+ UI.ChangeWidget(Id(:table), :SelectedItems,
+ UI.QueryWidget(Id(:table), :Items).map { | item | item[0][0] })
+ ret = nil
+ elsif ret == :deselect_all
+ UI.ChangeWidget(Id(:table), :SelectedItems, [])
+ ret = nil
+ elsif ret == :filter
filter_min = Convert.to_string(UI.QueryWidget(:min_chan, :Value))
filter_max = Convert.to_string(UI.QueryWidget(:max_chan, :Value))

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-s390-3.1.1/src/include/s390/dasd/helps.rb
new/yast2-s390-3.1.2/src/include/s390/dasd/helps.rb
--- old/yast2-s390-3.1.1/src/include/s390/dasd/helps.rb 2013-12-09
12:51:24.000000000 +0100
+++ new/yast2-s390-3.1.2/src/include/s390/dasd/helps.rb 2014-01-24
10:00:53.000000000 +0100
@@ -74,7 +74,7 @@
) +
# Disk selection dialog help 3/4
_(
- "<p>To perform actions on multiple disks at once, mark these disks
and click\n<b>Select or Deselect</b>.</p>\n"
+ "<p>To perform actions on multiple disks at once, mark these
disks. To select all displayed disk (possibly after applying a filter),
click\n<b>Select All</b> or <b>Deselect All</b>.</p>\n"
) +
# Disk selection dialog help 4/4
_(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-s390-3.1.1/src/modules/DASDController.rb
new/yast2-s390-3.1.2/src/modules/DASDController.rb
--- old/yast2-s390-3.1.1/src/modules/DASDController.rb 2013-12-09
12:51:24.000000000 +0100
+++ new/yast2-s390-3.1.2/src/modules/DASDController.rb 2014-01-24
10:00:53.000000000 +0100
@@ -58,7 +58,8 @@
# Data was modified?
@modified = false

-
+ # format all unformated devices upon activation?
+ @format_unformatted = false

@proposal_valid = false
end
@@ -137,21 +138,54 @@
def Write
if !Mode.normal
to_format = []
+ to_reactivate = []
+ unformatted_devices = []

Builtins.foreach(@devices) do |index, device|
channel = Ops.get_string(device, "channel", "")
format = Ops.get_boolean(device, "format", false)
do_diag = Ops.get_boolean(device, "diag", false)
- ActivateDisk(channel, do_diag)
+ act_ret = ActivateDisk(channel, do_diag)
+ # FIXME: general activation error handling - also in sync with below
+ # for AutoInstall, format unformatted disks later at once
+ # even disks manually selected for formatting must be reactivated
+ if Mode.autoinst && act_ret == 8 && ( @format_unformatted || format )
+ format = true
+ to_reactivate << device
+ end
if format
dev_name = GetDeviceName(channel)
- to_format = Builtins.add(to_format, dev_name) if dev_name != nil
+ to_format << device
+ # unformtted disk, manual (not AutoYaS)
+ elsif act_ret == 8
+ unformatted_devices << device
+ end
+ end
+
+ if unformatted_devices.size > 0
+ if unformatted_devices.size == 1
+ message = Builtins.sformat(_("Device %1 is not formatted. Format
device now?"), unformatted_devices[0])
+ else
+ message = BUiltins.sformat(_("There are %1 unformatted devices.
Format them now?"), unformatted_devices.size)
+ end
+ if Popup.ContinueCancel( message )
+ unformatted_devices.each do | device |
+ to_format << device
+ to_reactivate << device
+ end
end
end

Builtins.y2milestone("Disks to format: %1", to_format)

FormatDisks(to_format, 8) if !Builtins.isempty(to_format)
+
+ to_reactivate.each do | device |
+ channel = device["channel"] || ""
+ do_diag = device["diag"] || false
+ # FIXME: general activation error handling - also in sync with above
+ ActivateDisk(channel, do_diag)
+ end
end

if !Mode.installation
@@ -190,6 +224,8 @@
{ index => d }
end

+ @format_unformatted = settings["format_unformatted"] || false
+
true
end

@@ -202,7 +238,10 @@
Builtins.contains(["channel", "format", "diag"], k)
end }

- { "devices" => l }
+ {
+ "devices" => l,
+ "format_unformatted" => @format_unformatted
+ }
end


@@ -512,6 +551,7 @@
# Activate disk
# @param [String] channel string Name of the disk to activate
# @param [Boolean] diag boolean Activate DIAG or not
+ # @return [Integer] exit code of the activation command
def ActivateDisk(channel, diag)
command = Builtins.sformat(
"/sbin/dasd_configure '%1' %2 %3",
@@ -528,41 +568,8 @@
)

if ret == 8
- popup = Builtins.sformat(
- _(
- "Device %1 is not formatted. Format device now?\n" +
- "If you want to format multiple devices in parallel,\n" +
- "press 'Cancel' and select 'Perform Action', 'Format' later
on.\n"
- ),
- channel
- )
- if Mode.autoinst && Popup.TimedOKCancel(popup, 10) ||
- Popup.ContinueCancel(popup)
- cmd = Builtins.sformat(
- "ls '/sys/bus/ccw/devices/%1/block/' | tr -d '\n'",
- channel
- )
- disk = Convert.convert(
- SCR.Execute(path(".target.bash_output"), cmd),
- :from => "any",
- :to => "map <string, any>"
- )
- if Ops.get_integer(disk, "exit", -1) == 0 &&
- Ops.greater_than(
- Builtins.size(Ops.get_string(disk, "stdout", "")),
- 0
- )
- FormatDisks(
- [Builtins.sformat("/dev/%1", Ops.get_string(disk, "stdout",
""))],
- 1
- )
- ActivateDisk(channel, diag)
- else
- Popup.Error(
- Builtins.sformat("Couldn't find device for %1 channel", channel)
- )
- end
- end
+ # unformatted disk is now handled now outside this function
+ # however, don't issue any error
elsif ret == 7
# when return code is 7, set DASD offline
# https://bugzilla.novell.com/show_bug.cgi?id=561876#c9
@@ -573,7 +580,7 @@

@disk_configured = true

- nil
+ ret
end


@@ -806,7 +813,7 @@
publish :variable => :filter_min, :type => "string"
publish :variable => :filter_max, :type => "string"
publish :variable => :diag, :type => "map <string, boolean>"
- publish :function => :ActivateDisk, :type => "void (string, boolean)"
+ publish :function => :ActivateDisk, :type => "integer (string, boolean)"
publish :function => :DeactivateDisk, :type => "void (string, boolean)"
publish :function => :ProbeDisks, :type => "void ()"
publish :function => :FormatDisks, :type => "void (list <string>, integer)"

continue with "q"...


Checked in at Mon Jan 27 12:30:02 CET 2014 by ro

Remember to have fun...

--
To unsubscribe, e-mail: yast-devel+unsubscribe@xxxxxxxxxxxx
To contact the owner, e-mail: yast-devel+owner@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages