Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2016-07-01 09:57:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2016-06-13 21:50:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2016-07-01 09:57:58.000000000 +0200
@@ -1,0 +2,35 @@
+Mon Jun 27 13:00:24 UTC 2016 - jreidinger@suse.com
+
+- Make writing of bootloader settings the last step so that other
+ installation steps (kdump, cio-ignore) do not have to waste time
+ repeating it
+ (bnc#986649)
+- 3.1.198
+
+-------------------------------------------------------------------
+Thu Jun 23 08:17:24 UTC 2016 - lslezak@suse.cz
+
+- Display more information in the error popup when downloading
+ the optional installer updates fails (bsc#986091)
+- 3.1.197
+
+-------------------------------------------------------------------
+Thu Jun 16 13:31:16 UTC 2016 - igonzalezsosa@suse.com
+
+- Avoid restarting YaST when self-update repository exists but
+ is empty (bsc#985113)
+- 3.1.196
+
+-------------------------------------------------------------------
+Wed Jun 15 15:15:15 CEST 2016 - snwint@suse.de
+
+- call set_videomode to adjust video mode (bsc#974821)
+- 3.1.195
+
+-------------------------------------------------------------------
+Tue Jun 14 14:17:53 UTC 2016 - igonzalezsosa@suse.com
+
+- Fix architecture detection during self-update (bsc#984656)
+- 3.1.194
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.1.193.tar.bz2
New:
----
yast2-installation-3.1.198.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.2ewVCF/_old 2016-07-01 09:57:59.000000000 +0200
+++ /var/tmp/diff_new_pack.2ewVCF/_new 2016-07-01 09:57:59.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.193
+Version: 3.1.198
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-installation-3.1.193.tar.bz2 -> yast2-installation-3.1.198.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.193/package/yast2-installation.changes new/yast2-installation-3.1.198/package/yast2-installation.changes
--- old/yast2-installation-3.1.193/package/yast2-installation.changes 2016-06-09 17:16:03.000000000 +0200
+++ new/yast2-installation-3.1.198/package/yast2-installation.changes 2016-06-29 11:30:45.000000000 +0200
@@ -1,4 +1,39 @@
-------------------------------------------------------------------
+Mon Jun 27 13:00:24 UTC 2016 - jreidinger@suse.com
+
+- Make writing of bootloader settings the last step so that other
+ installation steps (kdump, cio-ignore) do not have to waste time
+ repeating it
+ (bnc#986649)
+- 3.1.198
+
+-------------------------------------------------------------------
+Thu Jun 23 08:17:24 UTC 2016 - lslezak@suse.cz
+
+- Display more information in the error popup when downloading
+ the optional installer updates fails (bsc#986091)
+- 3.1.197
+
+-------------------------------------------------------------------
+Thu Jun 16 13:31:16 UTC 2016 - igonzalezsosa@suse.com
+
+- Avoid restarting YaST when self-update repository exists but
+ is empty (bsc#985113)
+- 3.1.196
+
+-------------------------------------------------------------------
+Wed Jun 15 15:15:15 CEST 2016 - snwint@suse.de
+
+- call set_videomode to adjust video mode (bsc#974821)
+- 3.1.195
+
+-------------------------------------------------------------------
+Tue Jun 14 14:17:53 UTC 2016 - igonzalezsosa@suse.com
+
+- Fix architecture detection during self-update (bsc#984656)
+- 3.1.194
+
+-------------------------------------------------------------------
Thu Jun 2 11:09:33 UTC 2016 - schubi@suse.de
- Adapt AutoYaST to support import of SSH server keys/configuration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.193/package/yast2-installation.spec new/yast2-installation-3.1.198/package/yast2-installation.spec
--- old/yast2-installation-3.1.193/package/yast2-installation.spec 2016-06-09 17:16:03.000000000 +0200
+++ new/yast2-installation-3.1.198/package/yast2-installation.spec 2016-06-29 11:30:45.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.193
+Version: 3.1.198
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.193/src/lib/installation/cio_ignore.rb new/yast2-installation-3.1.198/src/lib/installation/cio_ignore.rb
--- old/yast2-installation-3.1.193/src/lib/installation/cio_ignore.rb 2016-06-09 17:16:03.000000000 +0200
+++ new/yast2-installation-3.1.198/src/lib/installation/cio_ignore.rb 2016-06-29 11:30:45.000000000 +0200
@@ -189,13 +189,8 @@
def add_boot_kernel_parameters
Yast.import "Bootloader"
- res = Yast::Bootloader.Read
-
- res &&= Yast::Bootloader.modify_kernel_params("cio_ignore" => "all,!ipldev,!condev")
-
- res &&= Yast::Bootloader.Write
-
- raise "failed to write kernel parameters for IPL and console device" if !res
+ # boot code is already proposed and will be written in next step, so just modify
+ Yast::Bootloader.modify_kernel_params("cio_ignore" => "all,!ipldev,!condev")
end
ACTIVE_DEVICES_FILE = "/boot/zipl/active_devices.txt"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.193/src/lib/installation/clients/inst_finish.rb new/yast2-installation-3.1.198/src/lib/installation/clients/inst_finish.rb
--- old/yast2-installation-3.1.193/src/lib/installation/clients/inst_finish.rb 2016-06-09 17:16:03.000000000 +0200
+++ new/yast2-installation-3.1.198/src/lib/installation/clients/inst_finish.rb 2016-06-29 11:30:45.000000000 +0200
@@ -191,8 +191,8 @@
install_bootloader_steps = [
"prep_shrink", # ensure that prep partition is small enough for boot sector (bnc#867345)
"cio_ignore", # needs to be run before initrd is created (bsc#933177)
- "bootloader",
- ProductFeatures.GetBooleanFeature("globals", "enable_kdump") == true ? "kdump" : ""
+ ProductFeatures.GetBooleanFeature("globals", "enable_kdump") == true ? "kdump" : "",
+ "bootloader"
]
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.193/src/lib/installation/clients/inst_update_installer.rb new/yast2-installation-3.1.198/src/lib/installation/clients/inst_update_installer.rb
--- old/yast2-installation-3.1.193/src/lib/installation/clients/inst_update_installer.rb 2016-06-09 17:16:03.000000000 +0200
+++ new/yast2-installation-3.1.198/src/lib/installation/clients/inst_update_installer.rb 2016-06-29 11:30:45.000000000 +0200
@@ -24,7 +24,7 @@
UPDATED_FLAG_FILENAME = "installer_updated"
REMOTE_SCHEMES = ["http", "https", "ftp", "tftp", "sftp", "nfs", "nfs4", "cifs", "smb"]
- Yast.import "Arch"
+ Yast.import "Pkg"
Yast.import "GetInstArgs"
Yast.import "Directory"
Yast.import "Installation"
@@ -129,7 +129,7 @@
# @see URI.regexp
def get_url_from(url)
return nil unless url.is_a?(::String)
- real_url = url.gsub(/\$arch\b/, Arch.architecture)
+ real_url = url.gsub(/\$arch\b/, Pkg.GetArchitecture)
URI.regexp.match(real_url) ? URI(real_url) : nil
end
@@ -174,9 +174,12 @@
def update_installer
log.info("Adding update from #{self_update_url}")
updates_manager.add_repository(self_update_url)
- log.info("Applying installer updates")
- updates_manager.apply_all
- true
+ updated = updates_manager.repositories?
+ if updated
+ log.info("Applying installer updates")
+ updates_manager.apply_all
+ end
+ updated
rescue ::Installation::UpdatesManager::NotValidRepo
if !using_default_url?
@@ -211,9 +214,19 @@
# false if the network is not configured.
def configure_network?
if Popup.YesNo(
+ # Note: the proxy cannot be configured in the YaST installer yet,
+ # it needs to be set via the "proxy" boot option.
# TRANSLATORS: %s is an URL
- format(_("Downloading installer updates from \n%s\nfailed.\n\n" \
- "Would you like to check your network configuration?"), self_update_url))
+ format(_("Downloading the optional installer updates from \n%s\nfailed.\n" \
+ "\n" \
+ "You can continue the installation without applying the updates.\n" \
+ "However, some potentially important bug fixes might be missing.\n" \
+ "\n" \
+ "If you need a proxy server to access the update repository\n" \
+ "then use the \"proxy\" boot parameter.\n" \
+ "\n" \
+ "Would you like to check your network configuration\n" \
+ "and try installing the updates again?"), self_update_url))
Yast::WFM.CallFunction("inst_lan", [{ "skip_detection" => true }])
true
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.193/src/lib/installation/update_repository.rb new/yast2-installation-3.1.198/src/lib/installation/update_repository.rb
--- old/yast2-installation-3.1.193/src/lib/installation/update_repository.rb 2016-06-09 17:16:03.000000000 +0200
+++ new/yast2-installation-3.1.198/src/lib/installation/update_repository.rb 2016-06-29 11:30:45.000000000 +0200
@@ -189,6 +189,15 @@
Yast::Pkg.SourceDelete(repo_id)
end
+ # Determine whether the repository is empty or not
+ #
+ # @return [Boolean] true if the repository is empty; false otherwise.
+ #
+ # @see #packages
+ def empty?
+ packages.empty?
+ end
+
private
# Fetch and build a squashfs filesytem for a given package
@@ -205,7 +214,7 @@
tempfile = Tempfile.new(package["name"])
tempfile.close
Dir.mktmpdir do |workdir|
- log.info("DEBUG 1")
+ log.info("Trying to get #{package["name"]} from repo #{repo_id}")
if !Yast::Pkg.ProvidePackage(repo_id, package["name"], tempfile.path.to_s)
log.error("Package #{package} could not be retrieved.")
raise PackageNotFound
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.193/src/lib/installation/updates_manager.rb new/yast2-installation-3.1.198/src/lib/installation/updates_manager.rb
--- old/yast2-installation-3.1.193/src/lib/installation/updates_manager.rb 2016-06-09 17:16:03.000000000 +0200
+++ new/yast2-installation-3.1.198/src/lib/installation/updates_manager.rb 2016-06-29 11:30:45.000000000 +0200
@@ -75,13 +75,19 @@
# information.
#
# @param uri [URI] URI where the repository lives
- # @return [Array