Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2014-07-11 20:05:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-07-02 15:04:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2014-07-11 20:05:30.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Jul 4 08:48:03 UTC 2014 - jreidin...@suse.com + +- Copy multipath blacklist to target system (bnc#885628) +- 3.1.99 + +------------------------------------------------------------------- +Thu Jul 3 09:14:53 UTC 2014 - jreidin...@suse.com + +- remove useless steps from system analysis because it confuses + users (bnc#885609) +- 3.1.98 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.97.tar.bz2 New: ---- yast2-installation-3.1.99.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.PFMcxS/_old 2014-07-11 20:05:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PFMcxS/_new 2014-07-11 20:05:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.97 +Version: 3.1.99 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.97.tar.bz2 -> yast2-installation-3.1.99.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.97/package/yast2-installation.changes new/yast2-installation-3.1.99/package/yast2-installation.changes --- old/yast2-installation-3.1.97/package/yast2-installation.changes 2014-07-01 08:07:19.000000000 +0200 +++ new/yast2-installation-3.1.99/package/yast2-installation.changes 2014-07-04 11:05:31.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Jul 4 08:48:03 UTC 2014 - jreidin...@suse.com + +- Copy multipath blacklist to target system (bnc#885628) +- 3.1.99 + +------------------------------------------------------------------- +Thu Jul 3 09:14:53 UTC 2014 - jreidin...@suse.com + +- remove useless steps from system analysis because it confuses + users (bnc#885609) +- 3.1.98 + +------------------------------------------------------------------- Mon Jun 30 14:34:59 UTC 2014 - jreidin...@suse.cz - restore: use restore script instead of manual unpacking tarball diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.97/package/yast2-installation.spec new/yast2-installation-3.1.99/package/yast2-installation.spec --- old/yast2-installation-3.1.97/package/yast2-installation.spec 2014-07-01 08:07:19.000000000 +0200 +++ new/yast2-installation-3.1.99/package/yast2-installation.spec 2014-07-04 11:05:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.97 +Version: 3.1.99 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.97/src/clients/copy_files_finish.rb new/yast2-installation-3.1.99/src/clients/copy_files_finish.rb --- old/yast2-installation-3.1.97/src/clients/copy_files_finish.rb 2014-07-01 08:07:19.000000000 +0200 +++ new/yast2-installation-3.1.99/src/clients/copy_files_finish.rb 2014-07-04 11:05:31.000000000 +0200 @@ -28,6 +28,8 @@ # Authors: # Jiri Srain <jsr...@suse.cz> # +require "fileutils" + module Yast class CopyFilesFinishClient < Client include Yast::Logger @@ -42,6 +44,7 @@ Yast.import "Linuxrc" Yast.import "Installation" Yast.import "Directory" + Yast.import "Mode" Yast.import "Packages" Yast.import "ProductControl" Yast.import "ProductProfile" @@ -109,6 +112,17 @@ ) end + # Copy multipath stuff (bnc#885628) + # Only in install, as update should keep its old config + if Mode.installation + multipath_config = "/etc/multipath/wwids" + if File.exist?(multipath_config) + log.info "Copying multipath blacklist '#{multipath_config}'" + target_path = File.join(Installation.destdir, multipath_config) + ::FileUtils.mkdir_p(File.dirname(target_path)) + ::FileUtils.cp(multipath_config, target_path) + end + end # -------------------------------------------------------------- # Copy /etc/install.inf into built system so that the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.97/src/clients/inst_system_analysis.rb new/yast2-installation-3.1.99/src/clients/inst_system_analysis.rb --- old/yast2-installation-3.1.97/src/clients/inst_system_analysis.rb 2014-07-01 08:07:19.000000000 +0200 +++ new/yast2-installation-3.1.99/src/clients/inst_system_analysis.rb 2014-07-04 11:05:31.000000000 +0200 @@ -124,10 +124,6 @@ WFM.CallFunction("inst_features", []) end - actions_todo << _("Search for Linux partitions") - actions_doing << _("Searching for Linux partitions...") - actions_functions << fun_ref(method(:SearchForLinuxPartitions), "boolean ()") - # FATE #302980: Simplified user config during installation actions_todo << _("Search for system files") actions_doing << _("Searching for system files...") @@ -137,10 +133,6 @@ actions_doing << _("Initializing software manager...") actions_functions << fun_ref(method(:InitInstallationRepositories), "boolean ()") - actions_todo << _("Evaluate update possibility") - actions_doing << _("Evaluating update possibility...") - actions_functions << fun_ref(method(:EvaluateUpdatePossibilities), "boolean ()") - Progress.New( # TRANSLATORS: dialog caption _("System Probing"), @@ -178,12 +170,6 @@ return :abort unless @packager_initialized - Builtins.y2milestone( - "Have Linux: %1, Offer Update: %2", - InstData.have_linux, - InstData.offer_update - ) - :next end @@ -304,31 +290,6 @@ true end - def EvaluateUpdatePossibilities - Builtins.y2milestone("Product flags: %1", Product.flags) - if Product.flags == nil || Builtins.size(Product.flags) == 0 - Builtins.y2warning("No product flags defined!") - InstData.offer_update = true - elsif Builtins.contains(Product.flags, "update") || Kernel.GetSuSEUpdate - InstData.offer_update = true - else - InstData.offer_update = false - end - - true - end - - - def SearchForLinuxPartitions - # ReReadTargetMap is needed to fix bug #806454 - Storage.ReReadTargetMap() - # SetPartProposalFirst is needed to fix bug #865579 - Storage.SetPartProposalFirst(true) - InstData.have_linux = Storage.HaveLinuxPartitions() - true - end - - def InitInstallationRepositories # disable callbacks PackageCallbacks.RegisterEmptyProgressCallbacks @@ -372,6 +333,11 @@ # FATE #120103: Import Users From Existing Partition # FATE #302980: Simplified user config during installation # All needs to be known before configuring users + # ReReadTargetMap is needed to fix bug #806454 + Storage.ReReadTargetMap() + # SetPartProposalFirst is needed to fix bug #865579 + Storage.SetPartProposalFirst(true) + Builtins.y2milestone("PreInstallFunctions -- start --") WFM.CallFunction("inst_pre_install", []) Builtins.y2milestone("PreInstallFunctions -- end --") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.97/src/modules/InstData.rb new/yast2-installation-3.1.99/src/modules/InstData.rb --- old/yast2-installation-3.1.97/src/modules/InstData.rb 2014-07-01 08:07:19.000000000 +0200 +++ new/yast2-installation-3.1.99/src/modules/InstData.rb 2014-07-04 11:05:31.000000000 +0200 @@ -41,10 +41,6 @@ @start_mode = nil - @offer_update = false - - @have_linux = false - # <-- system analysis # --> software selection @@ -108,8 +104,6 @@ end publish :variable => :start_mode, :type => "string" - publish :variable => :offer_update, :type => "boolean" - publish :variable => :have_linux, :type => "boolean" publish :variable => :selected_desktop, :type => "string" publish :variable => :current_systasks_status, :type => "map <string, boolean>" publish :variable => :product_license_accepted, :type => "boolean" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org