Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Leap:15.2 checked in at 2020-03-19 08:35:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/yast2-installation (Old)
and /work/SRC/openSUSE:Leap:15.2/.yast2-installation.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Thu Mar 19 08:35:51 2020 rev:163 rq:786016 version:4.2.38
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/yast2-installation/yast2-installation.changes
2020-03-13 10:55:21.588348462 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.yast2-installation.new.3160/yast2-installation.changes
2020-03-19 08:35:57.445835114 +0100
@@ -1,0 +2,14 @@
+Tue Mar 17 12:59:50 UTC 2020 - Josef Reidinger <[email protected]>
+
+- Drop few not needed recommends to have identical package on
+ opensuse and SLE (jsc#SLE-11936, jsc#SLE-11851)
+- 4.2.38
+
+-------------------------------------------------------------------
+Fri Mar 13 09:26:49 UTC 2020 - Josef Reidinger <[email protected]>
+
+- Add Abort confirmation for inst_welcome client used in firstboot
+ (bsc#1163347)
+- 4.2.37
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-4.2.36.tar.bz2
New:
----
yast2-installation-4.2.38.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.YC6eb1/_old 2020-03-19 08:35:57.773835314 +0100
+++ /var/tmp/diff_new_pack.YC6eb1/_new 2020-03-19 08:35:57.773835314 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 4.2.36
+Version: 4.2.38
Release: 0
Summary: YaST2 - Installation Parts
License: GPL-2.0-only
@@ -59,8 +59,6 @@
# Augeas lenses
Requires: augeas-lenses
# Only in inst-sys
-# Requires: yast2-add-on
-# Requires: yast2-update
Requires: yast2-storage-ng >= 4.0.175
# Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions)
@@ -115,15 +113,8 @@
Obsoletes: yast2-installation-devel-doc
-# install the registration module only in SLE (bsc#1043122)
-%if !0%{?is_opensuse}
-Recommends: yast2-registration
-%endif
Recommends: yast2-online-update
Recommends: yast2-firewall
-Recommends: release-notes
-Recommends: curl
-Recommends: yast2-update
Recommends: yast2-add-on
BuildArch: noarch
++++++ yast2-installation-4.2.36.tar.bz2 -> yast2-installation-4.2.38.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-4.2.36/doc/yupdate.md
new/yast2-installation-4.2.38/doc/yupdate.md
--- old/yast2-installation-4.2.36/doc/yupdate.md 2020-03-05
11:47:47.000000000 +0100
+++ new/yast2-installation-4.2.38/doc/yupdate.md 2020-03-17
15:52:58.000000000 +0100
@@ -51,7 +51,7 @@
## Installation
The `yupdate` script should run in the inst-sys. Since SLE15-SP2/openSUSE
-Leap 15.2, openSUSE Tumbleweed 2020xxxx, it ~~is~~ will be preinstalled.
+Leap 15.2, openSUSE Tumbleweed 20200314, it is preinstalled.
For older releases, run:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.2.36/package/yast2-installation.changes
new/yast2-installation-4.2.38/package/yast2-installation.changes
--- old/yast2-installation-4.2.36/package/yast2-installation.changes
2020-03-05 11:47:47.000000000 +0100
+++ new/yast2-installation-4.2.38/package/yast2-installation.changes
2020-03-17 15:52:58.000000000 +0100
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Tue Mar 17 12:59:50 UTC 2020 - Josef Reidinger <[email protected]>
+
+- Drop few not needed recommends to have identical package on
+ opensuse and SLE (jsc#SLE-11936, jsc#SLE-11851)
+- 4.2.38
+
+-------------------------------------------------------------------
+Fri Mar 13 09:26:49 UTC 2020 - Josef Reidinger <[email protected]>
+
+- Add Abort confirmation for inst_welcome client used in firstboot
+ (bsc#1163347)
+- 4.2.37
+
+-------------------------------------------------------------------
Thu Feb 27 15:03:36 UTC 2020 - Stefan Hundhammer <[email protected]>
- Make sure to show release notes for add-on products (bsc#1158287)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.2.36/package/yast2-installation.spec
new/yast2-installation-4.2.38/package/yast2-installation.spec
--- old/yast2-installation-4.2.36/package/yast2-installation.spec
2020-03-05 11:47:47.000000000 +0100
+++ new/yast2-installation-4.2.38/package/yast2-installation.spec
2020-03-17 15:52:58.000000000 +0100
@@ -16,7 +16,7 @@
#
Name: yast2-installation
-Version: 4.2.36
+Version: 4.2.38
Release: 0
Group: System/YaST
License: GPL-2.0-only
@@ -58,8 +58,6 @@
# Augeas lenses
Requires: augeas-lenses
# Only in inst-sys
-# Requires: yast2-add-on
-# Requires: yast2-update
Requires: yast2-storage-ng >= 4.0.175
# Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions)
@@ -115,15 +113,8 @@
Obsoletes: yast2-installation-devel-doc
-# install the registration module only in SLE (bsc#1043122)
-%if !0%{?is_opensuse}
-Recommends: yast2-registration
-%endif
Recommends: yast2-online-update
Recommends: yast2-firewall
-Recommends: release-notes
-Recommends: curl
-Recommends: yast2-update
Recommends: yast2-add-on
BuildArch: noarch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.2.36/src/lib/installation/clients/inst_welcome.rb
new/yast2-installation-4.2.38/src/lib/installation/clients/inst_welcome.rb
--- old/yast2-installation-4.2.36/src/lib/installation/clients/inst_welcome.rb
2020-03-05 11:47:47.000000000 +0100
+++ new/yast2-installation-4.2.38/src/lib/installation/clients/inst_welcome.rb
2020-03-17 15:52:58.000000000 +0100
@@ -38,37 +38,33 @@
Yast.import "CustomDialogs"
Yast.import "Language"
- @argmap = GetInstArgs.argmap
+ argmap = GetInstArgs.argmap
- @default_patterns = ["welcome.%1.txt", "welcome.txt"]
+ default_patterns = ["welcome.%1.txt", "welcome.txt"]
- @directory = Ops.get_string(@argmap, "directory", Directory.datadir)
+ directory = argmap["directory"] || Directory.datadir
- if Ops.get_string(@argmap, "directory", "") != ""
- @directory = Ops.add(Directory.custom_workflow_dir, @directory)
+ if Ops.get_string(argmap, "directory", "") != ""
+ directory = Directory.custom_workflow_dir + directory
end
- @patterns = Convert.convert(
- Ops.get(@argmap, "patterns", @default_patterns),
- from: "any",
- to: "list <string>"
- )
+ patterns = argmap["patterns"] || default_patterns
- @welcome = CustomDialogs.load_file_locale(
- @patterns,
- @directory,
+ welcome = CustomDialogs.load_file_locale(
+ patterns,
+ directory,
Language.language
)
- Builtins.y2debug("welcome map: %1", @welcome)
+ Builtins.y2debug("welcome map: %1", welcome)
- @display = UI.GetDisplayInfo
- @space = Ops.get_boolean(@display, "TextMode", true) ? 1 : 3
+ display = UI.GetDisplayInfo
+ space = display["TextMode"] ? 1 : 3
# dialog caption
- @caption = _("Welcome")
+ caption = _("Welcome")
# welcome text 1/4
- @text = _("<p><b>Welcome!</b></p>") +
+ text = _("<p><b>Welcome!</b></p>") +
# welcome text 2/4
_(
"<p>There are a few more steps to take before your system is ready
to\n" \
@@ -78,47 +74,49 @@
)
# welcome text
- @welcome_text = @welcome["text"]
- @welcome_text = @text if !@welcome_text || @welcome_text.empty?
+ welcome_text = welcome["text"]
+ welcome_text = text if !welcome_text || welcome_text.empty?
# help ttext
- @help = _(
+ help = _(
"<p>Click <b>Next</b> to perform the\nbasic configuration of the
system.</p>\n"
)
- @rt = Empty()
-
- if Builtins.regexpmatch(@welcome_text, "</.*>")
- @rt = RichText(Id(:welcome_text), @welcome_text)
+ if Builtins.regexpmatch(welcome_text, "</.*>")
+ rt = RichText(Id(:welcome_text), welcome_text)
else
Builtins.y2debug("plain text")
- @rt = RichText(Id(:welcome_text), Opt(:plainText), @welcome_text)
+ rt = RichText(Id(:welcome_text), Opt(:plainText), welcome_text)
end
- @contents = VBox(
- VSpacing(@space),
+ contents = VBox(
+ VSpacing(space),
HBox(
- HSpacing(Ops.multiply(2, @space)),
- @rt,
- HSpacing(Ops.multiply(2, @space))
+ HSpacing(2 * space),
+ rt,
+ HSpacing(2 * space)
),
VSpacing(2)
)
Wizard.SetContents(
- @caption,
- @contents,
- @help,
+ caption,
+ contents,
+ help,
GetInstArgs.enable_back,
GetInstArgs.enable_next
)
Wizard.SetFocusToNextButton
- @ret = UI.UserInput
+ ret = nil
+ loop do
+ ret = UI.UserInput
- deep_copy(@ret)
+ break if ret != :abort
+ break if Popup.ReallyAbort(:painless)
+ end
- # EOF
+ ret
end
end
end
