[yast-commit] [ci_new_pac] JFYI yast2-installation -> 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-installation -> sle12 ## BNC# 865579 : "Broken Suggested Partitioning" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-installation/yast2-installation.changes 2014-02-26 16:42:56.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-installation/yast2-installation.changes 2014-02-27 15:37:19.000000000 +0100 @@ -1,0 +2,19 @@ +Thu Feb 27 15:08:12 CET 2014 - aschnell@suse.de + +- reset proposal after rescanning storage (bnc#865579) +- 3.1.47 + +------------------------------------------------------------------- +Thu Feb 27 13:55:16 UTC 2014 - jreidinger@suse.com + +- revert back complete skip of probing due to disks with activation + (BNC#865579) +- 3.1.46 + +------------------------------------------------------------------- +Thu Feb 27 12:54:37 UTC 2014 - jreidinger@suse.com + +- Do not rerun system probing as it is already done (BNC#865579) +- 3.1.45 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-installation - at least 19 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-installation (Old) and /mounts/work_src_done/SLE12/yast2-installation (BS:build ID:33555 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-installation-3.1.44.tar.bz2 New: ---- yast2-installation-3.1.47.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.cNSqHQ/_old 2014-02-27 16:14:36.000000000 +0100 +++ /var/tmp/diff_new_pack.cNSqHQ/_new 2014-02-27 16:14:36.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.44 +Version: 3.1.47 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.44.tar.bz2 -> yast2-installation-3.1.47.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.44/package/yast2-installation.changes new/yast2-installation-3.1.47/package/yast2-installation.changes --- old/yast2-installation-3.1.44/package/yast2-installation.changes 2014-02-26 08:34:56.000000000 +0100 +++ new/yast2-installation-3.1.47/package/yast2-installation.changes 2014-02-27 15:34:53.000000000 +0100 @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Thu Feb 27 15:08:12 CET 2014 - aschnell@suse.de + +- reset proposal after rescanning storage (bnc#865579) +- 3.1.47 + +------------------------------------------------------------------- +Thu Feb 27 13:55:16 UTC 2014 - jreidinger@suse.com + +- revert back complete skip of probing due to disks with activation + (BNC#865579) +- 3.1.46 + +------------------------------------------------------------------- +Thu Feb 27 12:54:37 UTC 2014 - jreidinger@suse.com + +- Do not rerun system probing as it is already done (BNC#865579) +- 3.1.45 + +------------------------------------------------------------------- Wed Feb 26 09:15:50 UTC 2014 - jreidinger@suse.com - implement cio ignore feature during installation for s390x diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.44/package/yast2-installation.spec new/yast2-installation-3.1.47/package/yast2-installation.spec --- old/yast2-installation-3.1.44/package/yast2-installation.spec 2014-02-26 08:34:56.000000000 +0100 +++ new/yast2-installation-3.1.47/package/yast2-installation.spec 2014-02-27 15:34:53.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.44 +Version: 3.1.47 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.44/src/clients/inst_system_analysis.rb new/yast2-installation-3.1.47/src/clients/inst_system_analysis.rb --- old/yast2-installation-3.1.44/src/clients/inst_system_analysis.rb 2014-02-26 08:34:56.000000000 +0100 +++ new/yast2-installation-3.1.47/src/clients/inst_system_analysis.rb 2014-02-27 15:34:53.000000000 +0100 @@ -77,8 +77,6 @@ @packager_initialized = false - # <-- Function definitions - Wizard.SetContents(_("Analyzing the Computer"), Empty(), "", false, false) Wizard.SetTitleIcon("yast-controller") @@ -88,171 +86,73 @@ # constructors might depend on it. # In autoinst mode, this has been called already. - @actions_todo = [] - @actions_doing = [] - @actions_functions = [] + actions_todo = [] + actions_doing = [] + actions_functions = [] Builtins.y2milestone("Probing done: %1", Installation.probing_done) + # skip part of probes as it doesn't change, but some parts (mostly disks + # that can be activated) need rerun see BNC#865579 if !Installation.probing_done + # TRANSLATORS: progress steps in system probing if !(Arch.s390 || Arch.board_iseries) - # TRANSLATORS: progress step - @actions_todo = Builtins.add(@actions_todo, _("Probe USB devices")) - # TRANSLATORS: progress step - @actions_doing = Builtins.add( - @actions_doing, - _("Probing USB devices...") - ) - @actions_functions = Builtins.add( - @actions_functions, - fun_ref(method(:ActionUSB), "boolean ()") - ) - - # TRANSLATORS: progress step - @actions_todo = Builtins.add( - @actions_todo, - _("Probe FireWire devices") - ) - # TRANSLATORS: progress step - @actions_doing = Builtins.add( - @actions_doing, - _("Probing FireWire devices...") - ) - @actions_functions = Builtins.add( - @actions_functions, - fun_ref(method(:ActionFireWire), "boolean ()") - ) - - # TRANSLATORS: progress step - @actions_todo = Builtins.add( - @actions_todo, - _("Probe floppy disk devices") - ) - # TRANSLATORS: progress step - @actions_doing = Builtins.add( - @actions_doing, - _("Probing floppy disk devices...") - ) - @actions_functions = Builtins.add( - @actions_functions, - fun_ref(method(:ActionFloppyDisks), "boolean ()") - ) + actions_todo << _("Probe USB devices") + actions_doing << _("Probing USB devices...") + actions_functions << fun_ref(method(:ActionUSB), "boolean ()") + + actions_todo << _("Probe FireWire devices") + actions_doing << _("Probing FireWire devices...") + actions_functions << fun_ref(method(:ActionFireWire), "boolean ()") + + actions_todo << _("Probe floppy disk devices") + actions_doing << _("Probing floppy disk devices...") + actions_functions << fun_ref(method(:ActionFloppyDisks), "boolean ()") end - # TRANSLATORS: progress step - @actions_todo = Builtins.add( - @actions_todo, - _("Probe hard disk controllers") - ) - # TRANSLATORS: progress step - @actions_doing = Builtins.add( - @actions_doing, - _("Probing hard disk controllers...") - ) - @actions_functions = Builtins.add( - @actions_functions, - fun_ref(method(:ActionHHDControllers), "boolean ()") - ) - - # TRANSLATORS: progress step - @actions_todo = Builtins.add( - @actions_todo, - _("Load kernel modules for hard disk controllers") - ) - # TRANSLATORS: progress step - @actions_doing = Builtins.add( - @actions_doing, - _("Loading kernel modules for hard disk controllers...") - ) - @actions_functions = Builtins.add( - @actions_functions, - fun_ref(method(:ActionLoadModules), "boolean ()") - ) - - # TRANSLATORS: progress step - @actions_todo = Builtins.add(@actions_todo, _("Probe hard disks")) - # TRANSLATORS: progress step - @actions_doing = Builtins.add( - @actions_doing, - _("Probing hard disks...") - ) - @actions_functions = Builtins.add( - @actions_functions, - fun_ref(method(:ActionHDDProbe), "boolean ()") - ) + actions_todo << _("Probe hard disk controllers") + actions_doing << _("Probing hard disk controllers...") + actions_functions << fun_ref(method(:ActionHHDControllers), "boolean ()") + + actions_todo << _("Load kernel modules for hard disk controllers") + actions_doing << _("Loading kernel modules for hard disk controllers...") + actions_functions << fun_ref(method(:ActionLoadModules), "boolean ()") + + actions_todo << _("Probe hard disks") + actions_doing << _("Probing hard disks...") + actions_functions << fun_ref(method(:ActionHDDProbe), "boolean ()") WFM.CallFunction("inst_features", []) end - # TRANSLATORS: progress step - @actions_todo = Builtins.add( - @actions_todo, - _("Search for Linux partitions") - ) - # TRANSLATORS: progress step - @actions_doing = Builtins.add( - @actions_doing, - _("Searching for Linux partitions...") - ) - @actions_functions = Builtins.add( - @actions_functions, - fun_ref(method(:SearchForLinuxPartitions), "boolean ()") - ) + actions_todo << _("Search for Linux partitions") + actions_doing << _("Searching for Linux partitions...") + actions_functions << fun_ref(method(:SearchForLinuxPartitions), "boolean ()") - # TRANSLATORS: progress step - @actions_todo = Builtins.add(@actions_todo, _("Search for system files")) - # TRANSLATORS: progress step - @actions_doing = Builtins.add( - @actions_doing, - _("Searching for system files...") - ) # FATE #302980: Simplified user config during installation - @actions_functions = Builtins.add( - @actions_functions, - fun_ref(method(:FilesFromOlderSystems), "boolean ()") - ) - - # TRANSLATORS: progress step - @actions_todo = Builtins.add( - @actions_todo, - _("Evaluate update possibility") - ) - # TRANSLATORS: progress step - @actions_doing = Builtins.add( - @actions_doing, - _("Evaluating update possibility...") - ) - @actions_functions = Builtins.add( - @actions_functions, - fun_ref(method(:EvaluateUpdatePossibilities), "boolean ()") - ) - - # TRANSLATORS: progress step - @actions_todo = Builtins.add( - @actions_todo, - _("Initialize software manager") - ) - # TRANSLATORS: progress step - @actions_doing = Builtins.add( - @actions_doing, - _("Initializing software manager...") - ) - @actions_functions = Builtins.add( - @actions_functions, - fun_ref(method(:InitInstallationRepositories), "boolean ()") - ) + actions_todo << _("Search for system files") + actions_doing << _("Searching for system files...") + actions_functions << fun_ref(method(:FilesFromOlderSystems), "boolean ()") + + actions_todo << _("Evaluate update possibility") + actions_doing << _("Evaluating update possibility...") + actions_functions << fun_ref(method(:EvaluateUpdatePossibilities), "boolean ()") + + actions_todo << _("Initialize software manager") + actions_doing << _("Initializing software manager...") + actions_functions << fun_ref(method(:InitInstallationRepositories), "boolean ()") Progress.New( # TRANSLATORS: dialog caption _("System Probing"), " ", - Builtins.size(@actions_todo), - @actions_todo, - @actions_doing, + actions_todo.size, + actions_todo, + actions_doing, # TRANSLATORS: dialog help _("YaST is probing computer hardware and installed systems now.") ) - Builtins.foreach(@actions_functions) do |run_function| + actions_functions.each do |run_function| Progress.NextStage # Bugzilla #298049 # Allow to abort the probing @@ -265,13 +165,8 @@ next :abort end end - Builtins.y2milestone("Running function: %1", run_function) - run_this = Convert.convert( - run_function, - :from => "any", - :to => "boolean ()" - ) - ret = run_this.call + + ret = run_function.call Builtins.y2milestone("Function %1 returned %2", run_function, ret) end Installation.probing_done = true @@ -280,9 +175,8 @@ return :abort if ProductProfile.CheckCompliance(nil) == false Progress.Finish - Builtins.sleep(500) - return :abort if !@packager_initialized + return :abort unless @packager_initialized Builtins.y2milestone( "Have Linux: %1, Offer Update: %2", @@ -290,9 +184,8 @@ InstData.offer_update ) - :next + :next - # EOF end # Function definitions --> @@ -425,18 +318,18 @@ true end - def SearchForLinuxPartitions - Storage.ReReadTargetMap - if Storage.HaveLinuxPartitions - InstData.have_linux = true - else - InstData.have_linux = false - 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 InitInstallationRepositoriesReal + + def InitInstallationRepositories # disable callbacks PackageCallbacks.RegisterEmptyProgressCallbacks @@ -469,18 +362,6 @@ ret end - - def InitInstallationRepositories - #boolean progress_orig = Progress::set (false); - #y2milestone ("Pregress was: %1", progress_orig); - - ret = InitInstallationRepositoriesReal() - - #y2milestone ("Adjusting progress: %1", progress_orig); - #Progress::set (progress_orig); - - ret - end def FilesFromOlderSystems # FATE #300421: Import ssh keys from previous installations continue with "q"... Checked in at Thu Feb 27 16:15:18 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
ro