Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2015-04-22 01:12:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2015-04-07 09:28:45.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2015-04-22 01:12:48.000000000 +0200
@@ -1,0 +2,15 @@
+Wed Apr 20 13:11:40 CEST 2015 - [email protected]
+
+- Fixed differnt bugs in proposal overview with multiple tabs.
+- Checking if plymouth is available while starting second
+ installation stage for AutoYaST.
+- 3.1.140
+
+-------------------------------------------------------------------
+Thu Apr 16 13:02:23 CEST 2015 - [email protected]
+
+- Always enable systemd startup services for Second Stage and
+ Firstboot (bsc#924278)
+- 3.1.139
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.1.138.tar.bz2
New:
----
yast2-installation-3.1.140.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.NHEMKX/_old 2015-04-22 01:12:49.000000000 +0200
+++ /var/tmp/diff_new_pack.NHEMKX/_new 2015-04-22 01:12:49.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.138
+Version: 3.1.140
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -172,6 +172,15 @@
%service_add_post YaST2-Second-Stage.service YaST2-Firstboot.service
+# bsc#924278 Always enable these services by default, they are already listed
+# in systemd-presets-branding package, but that works for new installations
+# only, it does not work for upgrades from SLE 11 where scripts had different
+# name and were not handled by systemd.
+# When we upgrade/update from systemd-based system, scripts are always enabled
+# by the %service_add_post macro.
+systemctl enable YaST2-Second-Stage.service
+systemctl enable YaST2-Firstboot.service
+
%pre
%service_add_pre YaST2-Second-Stage.service YaST2-Firstboot.service
++++++ YaST2-Second-Stage.service ++++++
--- /var/tmp/diff_new_pack.NHEMKX/_old 2015-04-22 01:12:49.000000000 +0200
+++ /var/tmp/diff_new_pack.NHEMKX/_new 2015-04-22 01:12:49.000000000 +0200
@@ -18,7 +18,7 @@
# If the system starts in multi-user mode plymouth will be quit while
# installation in order to ensure that installation will be finished on
# console 1 and the login prompt. (bnc#903682,889757,897956)
-ExecStartPre=/bin/sh -c 'if [ `/usr/bin/systemctl get-default` =
"multi-user.target" ];then /usr/bin/plymouth quit; else /usr/bin/plymouth
deactivate --hide-splash; fi'
+ExecStartPre=/bin/sh -c 'if [ -x /usr/bin/plymouth ] ; then if [
`/usr/bin/systemctl get-default` = "multi-user.target" ];then /usr/bin/plymouth
quit; else /usr/bin/plymouth deactivate --hide-splash; fi; fi'
ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
RemainAfterExit=yes
TimeoutSec=0
++++++ yast2-installation-3.1.138.tar.bz2 -> yast2-installation-3.1.140.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.138/.travis.yml
new/yast2-installation-3.1.140/.travis.yml
--- old/yast2-installation-3.1.138/.travis.yml 2015-04-02 12:29:12.000000000
+0200
+++ new/yast2-installation-3.1.140/.travis.yml 2015-04-20 13:39:13.000000000
+0200
@@ -5,7 +5,7 @@
# disable rvm, use system Ruby
- rvm reset
- wget
https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
- - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite
yast2-core-dev yast2 yast2-network" -g "rspec:2.14.1 yast-rake gettext
rubocop:0.28.0"
+ - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite
yast2-core-dev yast2 yast2-network" -g "rspec:2.14.1 yast-rake gettext
rubocop:0.29.1"
script:
- rake check:syntax
- rake check:pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.138/CONTRIBUTING.md
new/yast2-installation-3.1.140/CONTRIBUTING.md
--- old/yast2-installation-3.1.138/CONTRIBUTING.md 2015-04-02
12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/CONTRIBUTING.md 2015-04-20
13:39:13.000000000 +0200
@@ -12,13 +12,13 @@
-----------
If you find a problem, please report it either using
-[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2)
+[Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2)
or [GitHub issues](../../issues). (For Bugzilla, use the [simplified
registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp)
if you don't have an account yet.)
If you find a problem, please report it either using
-[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee
+[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee
that every bug will be fixed, but we'll try.
When creating a bug report, please follow our [bug reporting
@@ -71,7 +71,7 @@
[widely used
conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
-If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure
+If your commit is related to a bug in Bugzilla or an issue on GitHub, make sure
you mention it in the commit message for cross-reference. Use format like
bnc#775814 or gh#yast/yast-foo#42. See also [GitHub
autolinking](https://help.github.com/articles/github-flavored-markdown#references)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.138/README.md
new/yast2-installation-3.1.140/README.md
--- old/yast2-installation-3.1.138/README.md 2015-04-02 12:29:12.000000000
+0200
+++ new/yast2-installation-3.1.140/README.md 2015-04-20 13:39:13.000000000
+0200
@@ -1,5 +1,50 @@
-# YaST - The Installation Framework #
+YaST Installation Framework
+===========================
[](https://travis-ci.org/yast/yast-installation)
[](https://ci.opensuse.org/view/Yast/job/yast-installation-master/)
+
+Description
+============
+
+This repository contains an installation framework based on the shared
+functionality provided by [yast2](https://github.com/yast/yast-yast2/) project,
+especially on [these libraries]
+(https://github.com/yast/yast-yast2/tree/master/library/control/src/modules).
+
+The framework typically calls different *experts in the field*, such as
Network,
+Storage or Users plug-ins to do the real job according to an installation
+workflow described in a particular control file for:
+
+- [openSUSE](https://github.com/yast/skelcd-control-openSUSE)
+- [SLES](https://github.com/yast/skelcd-control-SLES)
+- [SLED](https://github.com/yast/skelcd-control-SLED)
+
+More subject-specific pieces of information can be found in the [doc](doc)
+directory.
+
+Development
+===========
+
+This module is developed as part of YaST. See the
+[development
documentation](http://yastgithubio.readthedocs.org/en/latest/development/).
+
+
+Getting the Sources
+===================
+
+To get the source code, clone the GitHub repository:
+
+ $ git clone https://github.com/yast/yast-installation.git
+
+If you want to contribute into the project you can
+[fork](https://help.github.com/articles/fork-a-repo/) the repository and clone
your fork.
+
+
+Contact
+=======
+
+If you have any question, feel free to ask at the [development mailing
+list](http://lists.opensuse.org/yast-devel/) or at the
+[#yast](https://webchat.freenode.net/?channels=%23yast) IRC channel on
freenode.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/package/YaST2-Second-Stage.service
new/yast2-installation-3.1.140/package/YaST2-Second-Stage.service
--- old/yast2-installation-3.1.138/package/YaST2-Second-Stage.service
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/package/YaST2-Second-Stage.service
2015-04-20 13:39:13.000000000 +0200
@@ -18,7 +18,7 @@
# If the system starts in multi-user mode plymouth will be quit while
# installation in order to ensure that installation will be finished on
# console 1 and the login prompt. (bnc#903682,889757,897956)
-ExecStartPre=/bin/sh -c 'if [ `/usr/bin/systemctl get-default` =
"multi-user.target" ];then /usr/bin/plymouth quit; else /usr/bin/plymouth
deactivate --hide-splash; fi'
+ExecStartPre=/bin/sh -c 'if [ -x /usr/bin/plymouth ] ; then if [
`/usr/bin/systemctl get-default` = "multi-user.target" ];then /usr/bin/plymouth
quit; else /usr/bin/plymouth deactivate --hide-splash; fi; fi'
ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
RemainAfterExit=yes
TimeoutSec=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/package/yast2-installation.changes
new/yast2-installation-3.1.140/package/yast2-installation.changes
--- old/yast2-installation-3.1.138/package/yast2-installation.changes
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/package/yast2-installation.changes
2015-04-20 13:39:13.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Wed Apr 20 13:11:40 CEST 2015 - [email protected]
+
+- Fixed differnt bugs in proposal overview with multiple tabs.
+- Checking if plymouth is available while starting second
+ installation stage for AutoYaST.
+- 3.1.140
+
+-------------------------------------------------------------------
+Thu Apr 16 13:02:23 CEST 2015 - [email protected]
+
+- Always enable systemd startup services for Second Stage and
+ Firstboot (bsc#924278)
+- 3.1.139
+
+-------------------------------------------------------------------
Thu Apr 2 09:27:55 UTC 2015 - [email protected]
- avoid endless loop when confirm update in proposal runner
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/package/yast2-installation.spec
new/yast2-installation-3.1.140/package/yast2-installation.spec
--- old/yast2-installation-3.1.138/package/yast2-installation.spec
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/package/yast2-installation.spec
2015-04-20 13:39:13.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.138
+Version: 3.1.140
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -169,6 +169,15 @@
%service_add_post YaST2-Second-Stage.service YaST2-Firstboot.service
+# bsc#924278 Always enable these services by default, they are already listed
+# in systemd-presets-branding package, but that works for new installations
+# only, it does not work for upgrades from SLE 11 where scripts had different
+# name and were not handled by systemd.
+# When we upgrade/update from systemd-based system, scripts are always enabled
+# by the %service_add_post macro.
+systemctl enable YaST2-Second-Stage.service
+systemctl enable YaST2-Firstboot.service
+
%pre
%service_add_pre YaST2-Second-Stage.service YaST2-Firstboot.service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/src/clients/inst_addon_update_sources.rb
new/yast2-installation-3.1.140/src/clients/inst_addon_update_sources.rb
--- old/yast2-installation-3.1.138/src/clients/inst_addon_update_sources.rb
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/src/clients/inst_addon_update_sources.rb
2015-04-20 13:39:13.000000000 +0200
@@ -105,15 +105,15 @@
# popup error message
# %1 represents the the error message details
if Popup.YesNo(
- Builtins.sformat(
- _(
- "An error occurred while connecting to the server.\n" \
- "Details: %1\n" \
- "\n" \
- "Try again?"
- ),
- Pkg.LastError
- )
+ Builtins.sformat(
+ _(
+ "An error occurred while connecting to the server.\n" \
+ "Details: %1\n" \
+ "\n" \
+ "Try again?"
+ ),
+ Pkg.LastError
+ )
)
# try again
url = editUrl(url)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/src/clients/inst_disk_for_image.rb
new/yast2-installation-3.1.140/src/clients/inst_disk_for_image.rb
--- old/yast2-installation-3.1.138/src/clients/inst_disk_for_image.rb
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/src/clients/inst_disk_for_image.rb
2015-04-20 13:39:13.000000000 +0200
@@ -72,7 +72,7 @@
Builtins.y2milestone("TM: %1", target_map)
# FIXME: move blacklist to Storage
used_by_blacklist = [:CT_DMRAID, :CT_DMMULTIPATH, :CT_MDPART]
- filtered_map = target_map.select do | _key, value |
+ filtered_map = target_map.select do |_key, value|
Storage.IsDiskType(value["type"]) && (!used_by_blacklist.include?
value["used_by"])
end
filtered_map.keys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/src/clients/inst_download_release_notes.rb
new/yast2-installation-3.1.140/src/clients/inst_download_release_notes.rb
--- old/yast2-installation-3.1.138/src/clients/inst_download_release_notes.rb
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/src/clients/inst_download_release_notes.rb
2015-04-20 13:39:13.000000000 +0200
@@ -71,11 +71,11 @@
# installed may mean old (before upgrade) in initial stage
# product may not yet be selected although repo is already added
required_product_statuses = Stage.initial ? [:selected, :available] :
[:selected, :installed]
- products = Pkg.ResolvableProperties("", :product, "").select do |
product |
+ products = Pkg.ResolvableProperties("", :product, "").select do |product|
required_product_statuses.include? product["status"]
end
log.info("Products: #{products}")
- products.each do | product |
+ products.each do |product|
if InstData.stop_relnotes_download
log.info("Skipping release notes download due to previous download
issues")
break
@@ -99,7 +99,7 @@
url_base = url[0, pos]
url_template = url_base + filename_templ
log.info("URL template: #{url_base}")
- [Language.language, Language.language[0..1], "en"].each do | lang |
+ [Language.language, Language.language[0..1], "en"].each do |lang|
url = Builtins.sformat(url_template, lang)
log.info("URL: #{url}")
# Where we want to store the downloaded release notes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/src/clients/inst_extrasources.rb
new/yast2-installation-3.1.140/src/clients/inst_extrasources.rb
--- old/yast2-installation-3.1.138/src/clients/inst_extrasources.rb
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/src/clients/inst_extrasources.rb
2015-04-20 13:39:13.000000000 +0200
@@ -170,7 +170,7 @@
if InstallPackages(@message, @package_list)
# start the software manager
@ui = PackagesUI.RunPackageSelector(
- "mode" => :summaryMode
+ "mode" => :summaryMode
)
Builtins.y2milestone("Package manager returned: %1", @ui)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/src/clients/inst_pre_install.rb
new/yast2-installation-3.1.140/src/clients/inst_pre_install.rb
--- old/yast2-installation-3.1.138/src/clients/inst_pre_install.rb
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/src/clients/inst_pre_install.rb
2015-04-20 13:39:13.000000000 +0200
@@ -155,11 +155,11 @@
end
# mounting read-only
if !Convert.to_boolean(
- SCR.Execute(
- path(".target.mount"),
- [partition_device, mnt_tmpdir],
- "-o ro,noatime"
- )
+ SCR.Execute(
+ path(".target.mount"),
+ [partition_device, mnt_tmpdir],
+ "-o ro,noatime"
+ )
)
Builtins.y2error("Mounting falied!")
next
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/src/clients/inst_system_analysis.rb
new/yast2-installation-3.1.140/src/clients/inst_system_analysis.rb
--- old/yast2-installation-3.1.138/src/clients/inst_system_analysis.rb
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/src/clients/inst_system_analysis.rb
2015-04-20 13:39:13.000000000 +0200
@@ -59,9 +59,9 @@
if Mode.autoupgrade
Report.Import(
- "messages" => { "timeout" => 10 },
- "errors" => { "timeout" => 10 },
- "warnings" => { "timeout" => 10 }
+ "messages" => { "timeout" => 10 },
+ "errors" => { "timeout" => 10 },
+ "warnings" => { "timeout" => 10 }
)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/src/clients/inst_upgrade_urls.rb
new/yast2-installation-3.1.140/src/clients/inst_upgrade_urls.rb
--- old/yast2-installation-3.1.138/src/clients/inst_upgrade_urls.rb
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/src/clients/inst_upgrade_urls.rb
2015-04-20 13:39:13.000000000 +0200
@@ -1304,7 +1304,7 @@
elsif Ops.is_string?(Ops.get_string(repo, @REPO_ENABLED, "0"))
enabled = Ops.get_string(repo, @REPO_ENABLED, "0") == "1"
elsif Ops.is_boolean?(
- Ops.get_boolean(repo, @REPO_ENABLED, false)
+ Ops.get_boolean(repo, @REPO_ENABLED, false)
)
enabled = Ops.get_boolean(repo, @REPO_ENABLED, false)
end
@@ -1317,7 +1317,7 @@
elsif Ops.is_string?(Ops.get_string(repo, "autorefresh", "0"))
autorefresh = Ops.get_string(repo, "autorefresh", "0") == "1"
elsif Ops.is_boolean?(
- Ops.get_boolean(repo, "autorefresh", false)
+ Ops.get_boolean(repo, "autorefresh", false)
)
autorefresh = Ops.get_boolean(repo, "autorefresh", false)
end
@@ -1328,7 +1328,7 @@
elsif Ops.is_string?(Ops.get_string(repo, "keeppackages", "0"))
keeppackages = Ops.get_string(repo, "keeppackages", "0") == "1"
elsif Ops.is_boolean?(
- Ops.get_boolean(repo, "keeppackages", false)
+ Ops.get_boolean(repo, "keeppackages", false)
)
keeppackages = Ops.get_boolean(repo, "keeppackages", false)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/src/clients/umount_finish.rb
new/yast2-installation-3.1.140/src/clients/umount_finish.rb
--- old/yast2-installation-3.1.138/src/clients/umount_finish.rb 2015-04-02
12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/src/clients/umount_finish.rb 2015-04-20
13:39:13.000000000 +0200
@@ -357,12 +357,12 @@
# Copy the current state of random number generator to the installed
system
if LocalCommand(
- Builtins.sformat(
- "dd if='%1' bs=%2 count=1 of='%3'",
- String.Quote(random_path),
- read_poolsize,
- String.Quote(store_to)
- )
+ Builtins.sformat(
+ "dd if='%1' bs=%2 count=1 of='%3'",
+ String.Quote(random_path),
+ read_poolsize,
+ String.Quote(store_to)
+ )
)
Builtins.y2milestone(
"State of %1 has been successfully copied to %2",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/src/include/installation/inst_inc_second.rb
new/yast2-installation-3.1.140/src/include/installation/inst_inc_second.rb
--- old/yast2-installation-3.1.138/src/include/installation/inst_inc_second.rb
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/src/include/installation/inst_inc_second.rb
2015-04-20 13:39:13.000000000 +0200
@@ -584,11 +584,11 @@
if !Mode.autoupgrade
# Detect mode early to be able to setup steps correctly
if FileUtils.Exists(
- Ops.add(Installation.destdir, Installation.file_update_mode)
+ Ops.add(Installation.destdir, Installation.file_update_mode)
)
Mode.SetMode("update")
elsif FileUtils.Exists(
- Ops.add(Installation.destdir, Installation.file_live_install_mode)
+ Ops.add(Installation.destdir, Installation.file_live_install_mode)
)
Mode.SetMode("live_installation")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/src/lib/installation/cio_ignore.rb
new/yast2-installation-3.1.140/src/lib/installation/cio_ignore.rb
--- old/yast2-installation-3.1.138/src/lib/installation/cio_ignore.rb
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/src/lib/installation/cio_ignore.rb
2015-04-20 13:39:13.000000000 +0200
@@ -61,13 +61,13 @@
# TRANSLATORS: Installation overview
# IMPORTANT: Please, do not change the HTML link <a
href="...">...</a>, only visible text
(_(
- "Blacklist devices enabled (<a href=\"%s\">disable</a>)."
+ "Blacklist devices enabled (<a href=\"%s\">disable</a>)."
) % CIO_DISABLE_LINK)
else
# TRANSLATORS: Installation overview
# IMPORTANT: Please, do not change the HTML link <a
href="...">...</a>, only visible text
(_(
- "Blacklist devices disabled (<a href=\"%s\">enable</a>)."
+ "Blacklist devices disabled (<a href=\"%s\">enable</a>)."
) % CIO_ENABLE_LINK)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/src/lib/installation/proposal_runner.rb
new/yast2-installation-3.1.140/src/lib/installation/proposal_runner.rb
--- old/yast2-installation-3.1.138/src/lib/installation/proposal_runner.rb
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/src/lib/installation/proposal_runner.rb
2015-04-20 13:39:13.000000000 +0200
@@ -238,7 +238,7 @@
load_matching_submodules_list
@proposal = ""
@submodules_presentation.each do |mod|
- @proposal << @html[mod] || ""
+ @proposal << (@html[mod] || "")
end
display_proposal(@proposal)
submod_descriptions_and_build_menu
@@ -348,7 +348,7 @@
end
if mode_changed
- Yast::Wizard.SetHelpText(@store.help_text)
+ Yast::Wizard.SetHelpText(@store.help_text(@current_tab))
build_dialog
load_matching_submodules_list
@@ -440,7 +440,7 @@
presentation_modules = @store.presentation_order
presentation_modules = presentation_modules[@current_tab] if
@store.tabs?
proposal = presentation_modules.reduce("") do |res, mod|
- res << @html[mod]
+ res << (@html[mod] || "")
end
display_proposal(proposal)
end
@@ -453,7 +453,7 @@
)
# FATE #301151: Allow YaST proposals to have help texts
- Yast::Wizard.SetHelpText(@store.help_text)
+ Yast::Wizard.SetHelpText(@store.help_text(@current_tab))
if @store.tabs? && Yast::Ops.less_than(tab_to_switch, 999) &&
!current_tab_affected
switch_to_tab(tab_to_switch)
@@ -685,17 +685,19 @@
if @store.tabs?
tab_labels = @store.tab_labels
if Yast::UI.HasSpecialWidget(:DumbTab)
- panes = tab_labels.map do |label|
- Item(Id(t), label, label == tab_labels.first)
+ panes = tab_labels.map.with_index(0) do |label, id|
+ Item(Id(id), label, label == tab_labels.first)
end
rt = DumbTab(Id(:_cwm_tab), panes, rt)
else
- tabbar = tab_labels.each_with_object(HBox()) do |label, box|
- box.params << PushButton(Id(t), label)
+ box = HBox()
+ tabbar = tab_labels.map.with_index(0) do |label, id|
+ box.params << PushButton(Id(id), label)
end
rt = VBox(Left(tabbar), Frame("", rt))
end
end
+
if !enable_skip
vbox = VBox(
# Help message between headline and installation proposal / settings
summary.
@@ -723,7 +725,7 @@
Yast::Wizard.SetContents(
headline, # have_next_button
vbox,
- @store.help_text,
+ @store.help_text(@current_tab),
Yast::GetInstArgs.enable_back, # have_back_button
false
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/src/lib/installation/proposal_store.rb
new/yast2-installation-3.1.140/src/lib/installation/proposal_store.rb
--- old/yast2-installation-3.1.138/src/lib/installation/proposal_store.rb
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/src/lib/installation/proposal_store.rb
2015-04-20 13:39:13.000000000 +0200
@@ -67,7 +67,7 @@
# @return [String] Richtext, the complete help text: a common intro + all
# individual parts.
- def help_text(current_tab: nil)
+ def help_text(current_tab = nil)
# General part of the help text for all types of proposals
how_to_change = _(
"<p>\n" \
@@ -348,13 +348,16 @@
def modules_help(current_tab)
modules_order = presentation_order
- modules_order = modules_order[current_tab] if tabs?
+ if tabs? && current_tab
+ modules_order = modules_order[current_tab]
- modules_order.each_with_object("") do |client, text|
- next unless descriptions[client]["help"]
- next if descriptions[client]["help"].empty?
-
- text << descriptions[client]["help"]
+ modules_order.each_with_object("") do |client, text|
+ if descriptions[client] && !descriptions[client]["help"].to_s.empty?
+ text << descriptions[client]["help"]
+ end
+ end
+ else
+ ""
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/src/modules/ImageInstallation.rb
new/yast2-installation-3.1.140/src/modules/ImageInstallation.rb
--- old/yast2-installation-3.1.138/src/modules/ImageInstallation.rb
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/src/modules/ImageInstallation.rb
2015-04-20 13:39:13.000000000 +0200
@@ -1458,7 +1458,7 @@
"Cannot solve dependencies automatically, opening Packages UI"
)
diaret = PackagesUI.RunPackageSelector(
- "enable_repo_mgr" => false, "mode" => :summaryMode
+ "enable_repo_mgr" => false, "mode" => :summaryMode
)
Builtins.y2milestone("RunPackageSelector returned %1", diaret)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.138/src/modules/SystemFilesCopy.rb
new/yast2-installation-3.1.140/src/modules/SystemFilesCopy.rb
--- old/yast2-installation-3.1.138/src/modules/SystemFilesCopy.rb
2015-04-02 12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/src/modules/SystemFilesCopy.rb
2015-04-20 13:39:13.000000000 +0200
@@ -172,11 +172,11 @@
Builtins.y2milestone("Mounting %1 to %2", partition,
@tmp_mount_directory)
if !Convert.to_boolean(
- SCR.Execute(
- path(".target.mount"),
- [partition, @tmp_mount_directory],
- "-o ro,noatime"
- )
+ SCR.Execute(
+ path(".target.mount"),
+ [partition, @tmp_mount_directory],
+ "-o ro,noatime"
+ )
)
Builtins.y2error("Mounting failed!")
return false
@@ -221,7 +221,7 @@
Builtins.y2milestone("Umounting %1", partition)
if !Convert.to_boolean(
- SCR.Execute(path(".target.umount"), @tmp_mount_directory)
+ SCR.Execute(path(".target.umount"), @tmp_mount_directory)
)
Builtins.y2warning("Umounting failed!")
end
Files old/yast2-installation-3.1.138/temporary/1024x768.jpg and
new/yast2-installation-3.1.140/temporary/1024x768.jpg differ
Files old/yast2-installation-3.1.138/temporary/1152x768.jpg and
new/yast2-installation-3.1.140/temporary/1152x768.jpg differ
Files old/yast2-installation-3.1.138/temporary/1280x1024.jpg and
new/yast2-installation-3.1.140/temporary/1280x1024.jpg differ
Files old/yast2-installation-3.1.138/temporary/1280x800.jpg and
new/yast2-installation-3.1.140/temporary/1280x800.jpg differ
Files old/yast2-installation-3.1.138/temporary/1400x1050.jpg and
new/yast2-installation-3.1.140/temporary/1400x1050.jpg differ
Files old/yast2-installation-3.1.138/temporary/1600x1200.jpg and
new/yast2-installation-3.1.140/temporary/1600x1200.jpg differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.138/temporary/Makefile.am
new/yast2-installation-3.1.140/temporary/Makefile.am
--- old/yast2-installation-3.1.138/temporary/Makefile.am 2015-04-02
12:29:12.000000000 +0200
+++ new/yast2-installation-3.1.140/temporary/Makefile.am 1970-01-01
01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-#
-# Makefile.am for installation/startup/InstallImages
-#
-ystartupbindir = $(ystartupdir)/startup/InstallImages
-
-ystartupbin_SCRIPTS = $(wildcard *.jpg *.png)
-
-EXTRA_DIST = $(ystartupbin_SCRIPTS)
Files old/yast2-installation-3.1.138/temporary/fallback.png and
new/yast2-installation-3.1.140/temporary/fallback.png differ
