February 2014 - YaST Commits - openSUSE Mailing Lists

[yast-commit] [ci_new_pac] JFYI yast2-ruby-bindings -> sle12
by ro 27 Feb '14

27 Feb '14

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-ruby-bindings -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-ruby-bindings/yast2-ruby-bindings.changes 2014-02-26 16:45:08.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-ruby-bindings/yast2-ruby-bindings.changes 2014-02-27 13:23:43.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 27 12:10:11 UTC 2014 - jreidinger(a)suse.com + +- fix precedence of loading files in lib +- 3.1.13 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-ruby-bindings - at least 77 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-ruby-bindings (Old) and /mounts/work_src_done/SLE12/yast2-ruby-bindings (BS:build ID:33534 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ruby-bindings", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-ruby-bindings-3.1.12.tar.bz2 New: ---- yast2-ruby-bindings-3.1.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ruby-bindings.spec ++++++ --- /var/tmp/diff_new_pack.rMEClM/_old 2014-02-27 16:16:05.000000000 +0100 +++ /var/tmp/diff_new_pack.rMEClM/_new 2014-02-27 16:16:05.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-ruby-bindings -Version: 3.1.12 +Version: 3.1.13 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ruby-bindings-%{version}.tar.bz2 ++++++ yast2-ruby-bindings-3.1.12.tar.bz2 -> yast2-ruby-bindings-3.1.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.12/package/yast2-ruby-bindings.changes new/yast2-ruby-bindings-3.1.13/package/yast2-ruby-bindings.changes --- old/yast2-ruby-bindings-3.1.12/package/yast2-ruby-bindings.changes 2014-02-26 15:04:56.000000000 +0100 +++ new/yast2-ruby-bindings-3.1.13/package/yast2-ruby-bindings.changes 2014-02-27 13:19:58.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 27 12:10:11 UTC 2014 - jreidinger(a)suse.com + +- fix precedence of loading files in lib +- 3.1.13 + +------------------------------------------------------------------- Wed Feb 26 12:22:48 UTC 2014 - lslezak(a)suse.cz - added N_() and Nn_() gettext equivalents (to only mark a text diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.12/package/yast2-ruby-bindings.spec new/yast2-ruby-bindings-3.1.13/package/yast2-ruby-bindings.spec --- old/yast2-ruby-bindings-3.1.12/package/yast2-ruby-bindings.spec 2014-02-26 15:04:56.000000000 +0100 +++ new/yast2-ruby-bindings-3.1.13/package/yast2-ruby-bindings.spec 2014-02-27 13:19:58.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-ruby-bindings -Version: 3.1.12 +Version: 3.1.13 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ruby-bindings-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.12/src/ruby/yast.rb new/yast2-ruby-bindings-3.1.13/src/ruby/yast.rb --- old/yast2-ruby-bindings-3.1.12/src/ruby/yast.rb 2014-02-26 15:04:56.000000000 +0100 +++ new/yast2-ruby-bindings-3.1.13/src/ruby/yast.rb 2014-02-27 13:19:58.000000000 +0100 @@ -44,8 +44,9 @@ require "yast/ui_shortcuts" require "yast/wfm" -#add yast specific path for ruby libraries, similar to lib directory in rails -Yast.y2paths.each do |p| +# add yast specific path for ruby libraries, similar to lib directory in rails +# unshift it in reverse order to keep precedence +Yast.y2paths.reverse.each do |p| dir_path = File.join(p, "lib") if File.exists? dir_path $LOAD_PATH.unshift dir_path continue with "q"... Checked in at Thu Feb 27 16:16:34 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [yast/yast-control-center]
by GitHub 27 Feb '14

27 Feb '14

Branch: refs/heads/save-y2logs-path Home: https://github.com/yast/yast-control-center

1 0

[yast-commit] [ci_new_pac] JFYI yast2-registration -> sle12
by ro 27 Feb '14

27 Feb '14

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-registration -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-02-26 16:44:39.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-02-27 14:17:13.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 27 08:35:31 UTC 2014 - lslezak(a)suse.cz + +- Check for errors when adding/refreshing services +- 3.1.13 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-registration ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-registration (Old) and /mounts/work_src_done/SLE12/yast2-registration (BS:build ID:33540 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-registration-3.1.12.tar.bz2 New: ---- yast2-registration-3.1.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.0iZhH4/_old 2014-02-27 16:15:52.000000000 +0100 +++ /var/tmp/diff_new_pack.0iZhH4/_new 2014-02-27 16:15:52.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.12 +Version: 3.1.13 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,13 +28,11 @@ Requires: yast2 >= 2.23.13 Requires: yast2-pkg-bindings >= 2.17.20 -# Y2Logger -Requires: yast2-ruby-bindings >= 3.1.7 +# N_() method +Requires: yast2-ruby-bindings >= 3.1.12 # SCC API library Requires: rubygem-scc_api >= 0.2.4 Requires: yast2-slp >= 3.1.2 -# Language module -Requires: yast2-country BuildRequires: yast2 >= 2.23.13 BuildRequires: update-desktop-files ++++++ yast2-registration-3.1.12.tar.bz2 -> yast2-registration-3.1.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.12/package/yast2-registration.changes new/yast2-registration-3.1.13/package/yast2-registration.changes --- old/yast2-registration-3.1.12/package/yast2-registration.changes 2014-02-26 15:09:57.000000000 +0100 +++ new/yast2-registration-3.1.13/package/yast2-registration.changes 2014-02-27 14:14:53.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 27 08:35:31 UTC 2014 - lslezak(a)suse.cz + +- Check for errors when adding/refreshing services +- 3.1.13 + +------------------------------------------------------------------- Wed Feb 26 14:44:09 CET 2014 - locilka(a)suse.com - Initializing packager before registration on a running system diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.12/package/yast2-registration.spec new/yast2-registration-3.1.13/package/yast2-registration.spec --- old/yast2-registration-3.1.12/package/yast2-registration.spec 2014-02-26 15:09:57.000000000 +0100 +++ new/yast2-registration-3.1.13/package/yast2-registration.spec 2014-02-27 14:14:53.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.12 +Version: 3.1.13 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,13 +28,11 @@ Requires: yast2 >= 2.23.13 Requires: yast2-pkg-bindings >= 2.17.20 -# Y2Logger -Requires: yast2-ruby-bindings >= 3.1.7 +# N_() method +Requires: yast2-ruby-bindings >= 3.1.12 # SCC API library Requires: rubygem-scc_api >= 0.2.4 Requires: yast2-slp >= 3.1.2 -# Language module -Requires: yast2-country BuildRequires: yast2 >= 2.23.13 BuildRequires: update-desktop-files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.12/src/Makefile.am new/yast2-registration-3.1.13/src/Makefile.am --- old/yast2-registration-3.1.12/src/Makefile.am 2014-02-26 15:09:57.000000000 +0100 +++ new/yast2-registration-3.1.13/src/Makefile.am 2014-02-27 14:14:53.000000000 +0100 @@ -9,7 +9,9 @@ ylibdir = @ylibdir@/registration ylib_DATA = \ - lib/registration/registration.rb + lib/registration/exceptions.rb \ + lib/registration/sw_mgmt.rb \ + lib/registration/helpers.rb EXTRA_DIST = $(client_DATA) $(desktop_DATA) $(ylib_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.12/src/clients/inst_scc.rb new/yast2-registration-3.1.13/src/clients/inst_scc.rb --- old/yast2-registration-3.1.12/src/clients/inst_scc.rb 2014-02-26 15:09:57.000000000 +0100 +++ new/yast2-registration-3.1.13/src/clients/inst_scc.rb 2014-02-27 14:14:53.000000000 +0100 @@ -25,18 +25,15 @@ # use external rubygem for SCC communication require "scc_api" -require "tmpdir" -require "fileutils" +require "registration/exceptions" +require "registration/helpers" module Yast class InstSccClient < Client include Yast::Logger - ZYPP_DIR = "/etc/zypp" - def main Yast.import "UI" - Yast.import "Pkg" textdomain "registration" @@ -45,9 +42,6 @@ Yast.import "Wizard" Yast.import "Report" Yast.import "Mode" - Yast.import "Progress" - Yast.import "PackageCallbacks" - Yast.import "Language" # redirect the scc_api log to y2log SccApi::GlobalLogger.instance.log = Y2Logger.instance @@ -90,6 +84,12 @@ else Report.Error(_("Registration failed.")) end + rescue Registration::ServiceError => e + log.error("Service error: #{e.message % e.service}") + Report.Error(_(e.message) % e.service) + rescue Registration::PkgError => e + log.error("Pkg error: #{e.message}") + Report.Error(_(e.message)) rescue Exception => e log.error("SCC registration failed: #{e}, #{e.backtrace}") Report.Error(_("Registration failed.")) @@ -109,7 +109,7 @@ scc = SccApi::Connection.new(email, reg_code) # set the current language to receive translated error messages - scc.language = language + scc.language = Registration::Helpers.language # announce (register the system) first credentials = run_with_feedback(_("Registering the System..."), _("Contacting the SUSE Customer Center server")) do @@ -117,7 +117,7 @@ end # ensure the zypp config directories are writable in inst-sys - ensure_zypp_config_writable + Registration::SwMgmt.zypp_config_writable! # write the global credentials credentials.write @@ -125,7 +125,7 @@ # then register the product(s) product_services = run_with_feedback(_("Registering the Product..."), _("Contacting the SUSE Customer Center server")) do # there will be just one base product, but theoretically there can be more... - selected_base_products.map do |base_product| + Registration::SwMgmt.products_to_register.map do |base_product| log.info("Registering base product: #{base_product.inspect}") scc.register(base_product) end @@ -144,38 +144,11 @@ ) Progress.NextStage - add_services(product_services, credentials) - Progress.Finish - end - end - # add the services to libzypp and load (refresh) them - def add_services(product_services, credentials) - # save repositories before refreshing added services (otherwise - # pkg-bindings will treat them as removed by the service refresh and - # unload them) - Pkg.SourceSaveAll - - # each registered product - product_services.each do |product_service| - # services for the each product - product_service.services.each do |service| - log.info "Adding service #{service.name.inspect} (#{service.url})" - - # progress bar label - Progress.Title(_("Adding service %s...") % service.name) - - # TODO FIXME: SCC currenly does not return credentials for the service, - # just reuse the global credentials and save to a different file - credentials.file = service.name + "_credentials" - credentials.write - - Pkg.ServiceAdd(service.name, service.url.to_s) - # refresh works only for saved services - Pkg.ServiceSave(service.name) - Pkg.ServiceRefresh(service.name) - - Progress.NextStep + begin + Registration::SwMgmt.add_services(product_services, credentials) + ensure + Progress.Finish end end end @@ -215,26 +188,6 @@ ) end - def selected_base_products - # just for debugging: - # return [{"name" => "SUSE_SLES", "arch" => "x86_64", "version" => "12-"}] - - # source 0 is the base installation repo, the repos added later are considered as add-ons - # although they can also contain a different base product - # - # on a running system, products are :installed - selected_base_products = Pkg.ResolvableProperties("", :product, "").find_all do |p| - p["status"] == :selected || p["status"] == :installed - end - - # filter out not needed data - product_info = selected_base_products.map{|p| { "name" => p["name"], "arch" => p["arch"], "version" => p["version"]}} - - log.info("Found selected/installed base products: #{product_info}") - - product_info - end - def run_with_feedback(header, label, &block) Popup.ShowFeedback(header, label) yield @@ -242,25 +195,6 @@ Popup.ClearFeedback end - # during installation /etc/zypp directory is not writable (mounted on - # a read-only file system), the workaround is to copy the whole directory - # structure into a writable temporary directory and override the original - # location by "mount -o bind" - def ensure_zypp_config_writable - if Mode.installation && !File.writable?(ZYPP_DIR) - log.info "Copying libzypp config to a writable place" - - # create writable zypp directory structure in /tmp - tmpdir = Dir.mktmpdir - - log.info "Copying #{ZYPP_DIR} to #{tmpdir} ..." - ::FileUtils.cp_r ZYPP_DIR, tmpdir - - log.info "Mounting #{tmpdir} to #{ZYPP_DIR}" - `mount -o bind #{tmpdir}/zypp #{ZYPP_DIR}` - end - end - def confirm_skipping # Popup question: confirm skipping the registration confirmation = _("If you do not register your system we will not be able\n" + @@ -272,19 +206,6 @@ Popup.YesNo(confirmation) end - def language - lang = Language.language - log.info "Current language: #{lang}" - - # remove the encoding (e.g. ".UTF-8") - lang.sub!(/\..*$/, "") - # replace lang/country separator "_" -> "-" - # see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4 - lang.tr!("_", "-") - - log.info "Language for HTTP requests set to #{lang.inspect}" - lang - end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.12/src/clients/scc.rb new/yast2-registration-3.1.13/src/clients/scc.rb --- old/yast2-registration-3.1.12/src/clients/scc.rb 2014-02-26 15:09:57.000000000 +0100 +++ new/yast2-registration-3.1.13/src/clients/scc.rb 2014-02-27 14:14:53.000000000 +0100 @@ -23,14 +23,15 @@ # this is just a wrapper for running the SCC client in installed system -require "registration/registration" +require "registration/sw_mgmt" module Yast import "Wizard" Wizard.CreateDialog - Yast::Registration.initialize_libzypp + Registration::SwMgmt.init + WFM.call("inst_scc") - Yast::Registration.save_libzypp + Wizard.CloseDialog end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.12/src/lib/registration/exceptions.rb new/yast2-registration-3.1.13/src/lib/registration/exceptions.rb --- old/yast2-registration-3.1.12/src/lib/registration/exceptions.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.13/src/lib/registration/exceptions.rb 2014-02-27 14:14:53.000000000 +0100 @@ -0,0 +1,36 @@ +# encoding: utf-8 + +# ------------------------------------------------------------------------------ +# Copyright (c) 2014 Novell, Inc. All Rights Reserved. +# +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, you may find +# current contact information at www.novell.com. +# ------------------------------------------------------------------------------ +# +# +module Registration + # Exception class for handling all Pkg errors + class PkgError < RuntimeError + end + + class ServiceError < PkgError + attr_reader :service + + def initialize(msg, service) + super(msg) + @service = service + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.12/src/lib/registration/helpers.rb new/yast2-registration-3.1.13/src/lib/registration/helpers.rb --- old/yast2-registration-3.1.12/src/lib/registration/helpers.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.13/src/lib/registration/helpers.rb 2014-02-27 14:14:53.000000000 +0100 @@ -0,0 +1,52 @@ +# encoding: utf-8 + +# ------------------------------------------------------------------------------ +# Copyright (c) 2014 Novell, Inc. All Rights Reserved. +# +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, you may find +# current contact information at www.novell.com. +# ------------------------------------------------------------------------------ +# +# + +require "yast" + +module Registration + + class Helpers + include Yast::Logger + + # Get the language for using in HTTP requests (in "Accept-Language" header) + def self.language + lang = Yast::WFM.GetLanguage + log.info "Current language: #{lang}" + + if lang == "POSIX" || lang == "C" + log.warn "Ignoring #{lang.inspect} language for HTTP requests" + return nil + end + + # remove the encoding (e.g. ".UTF-8") + lang.sub!(/\..*$/, "") + # replace lang/country separator "_" -> "-" + # see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4 + lang.tr!("_", "-") + + log.info "Language for HTTP requests set to #{lang.inspect}" + lang + end + + end +end \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.12/src/lib/registration/registration.rb new/yast2-registration-3.1.13/src/lib/registration/registration.rb --- old/yast2-registration-3.1.12/src/lib/registration/registration.rb 2014-02-26 15:09:57.000000000 +0100 +++ new/yast2-registration-3.1.13/src/lib/registration/registration.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -# encoding: utf-8 - -# ------------------------------------------------------------------------------ -# Copyright (c) 2014 Novell, Inc. All Rights Reserved. -# -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of version 2 of the GNU General Public License as published by the -# Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, you may find -# current contact information at www.novell.com. -# ------------------------------------------------------------------------------ -# -# - -require "yast" - -module Yast - Yast.import "Pkg" - Yast.import "Installation" - Yast.import "PackageCallbacksInit" - - class Registration - def self.initialize_libzypp - PackageCallbacksInit.InitPackageCallbacks - Pkg.TargetInitialize(Installation.destdir) - Pkg.TargetLoad - Pkg.SourceStartManager(true) - end - - def self.save_libzypp - Pkg.SourceSaveAll - end - end -end - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.12/src/lib/registration/sw_mgmt.rb new/yast2-registration-3.1.13/src/lib/registration/sw_mgmt.rb --- old/yast2-registration-3.1.12/src/lib/registration/sw_mgmt.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.13/src/lib/registration/sw_mgmt.rb 2014-02-27 14:14:53.000000000 +0100 @@ -0,0 +1,141 @@ +# encoding: utf-8 + +# ------------------------------------------------------------------------------ +# Copyright (c) 2014 Novell, Inc. All Rights Reserved. +# +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, you may find +# current contact information at www.novell.com. +# ------------------------------------------------------------------------------ +# +# + +require "yast" + +require "tmpdir" +require "fileutils" + +require "registration/exceptions" + +module Registration + Yast.import "Mode" + Yast.import "Pkg" + Yast.import "Installation" + Yast.import "PackageCallbacksInit" + Yast.import "Progress" + + class SwMgmt + include Yast + include Yast::Logger + extend Yast::I18n + + textdomain "registration" + + ZYPP_DIR = "/etc/zypp" + + def self.init + # display progress when refreshing repositories + PackageCallbacksInit.InitPackageCallbacks + Pkg.TargetInitialize(Installation.destdir) + Pkg.TargetLoad + Pkg.SourceStartManager(true) + end + + # during installation /etc/zypp directory is not writable (mounted on + # a read-only file system), the workaround is to copy the whole directory + # structure into a writable temporary directory and override the original + # location by "mount -o bind" + def self.zypp_config_writable! + return if !Mode.installation || File.writable?(ZYPP_DIR) + + log.info "Copying libzypp config to a writable place" + + # create writable zypp directory structure in /tmp + tmpdir = Dir.mktmpdir + + log.info "Copying #{ZYPP_DIR} to #{tmpdir} ..." + ::FileUtils.cp_r ZYPP_DIR, tmpdir + + log.info "Mounting #{tmpdir} to #{ZYPP_DIR}" + `mount -o bind #{tmpdir}/zypp #{ZYPP_DIR}` + end + + def self.products_to_register + # just for debugging: + # return [{"name" => "SUSE_SLES", "arch" => "x86_64", "version" => "12-"}] + + # during installation the products are :selected, + # on a running system the products are :installed + products = Pkg.ResolvableProperties("", :product, "").find_all do |p| + p["status"] == :selected || p["status"] == :installed + end + + # filter out not needed data + product_info = products.map do |p| + { "name" => p["name"], "arch" => p["arch"], "version" => p["version"]} + end + + log.info("Products to register: #{product_info}") + + product_info + end + + # add the services to libzypp and load (refresh) them + def self.add_services(product_services, credentials) + # save repositories before refreshing added services (otherwise + # pkg-bindings will treat them as removed by the service refresh and + # unload them) + if !Pkg.SourceSaveAll + # error message + raise Registration::PkgError, N_("Saving repository configuration failed.") + end + + # services for registered products + services = product_services.map &:services + + services.each do |service| + log.info "Adding service #{service.name.inspect} (#{service.url})" + + # progress bar label + Progress.Title(_("Adding service %s...") % service.name) + + # TODO FIXME: SCC currenly does not return credentials for the service, + # just reuse the global credentials and save to a different file + credentials.file = service.name + "_credentials" + credentials.write + + if !Pkg.ServiceAdd(service.name, service.url.to_s) + # error message + raise Registration::ServiceError.new(N_("Adding service '%s' failed."), service.name) + end + # refresh works only for saved services + if !Pkg.ServiceSave(service.name) + # error message + raise Registration::ServiceError.new(N_("Saving service '%s' failed."), service.name) + end + + if !Pkg.ServiceRefresh(service.name) + # error message + raise Registration::ServiceError.new(N_("Refreshing service '%s' failed."), service.name) + end + + Progress.NextStep + end + ensure + Pkg.SourceSaveAll + end + + end +end + continue with "q"... Checked in at Thu Feb 27 16:16:01 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 33540 changed to accepted (submit SUSE:SLE-12:GA/yast2-registration)
by Ruediger Oertel 27 Feb '14

27 Feb '14

Visit https://build.suse.de/request/show/33540 State of request 33540 was changed by oertel: new -> accepted Comment: Accepted submit request 33540 from user licensedigger Actions: - submit Devel:YaST:Head/yast2-registration => SUSE:SLE-12:GA/yast2-registration -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 33532 changed to accepted (submit SUSE:SLE-12:GA/yast2-network)
by Ruediger Oertel 27 Feb '14

27 Feb '14

Visit https://build.suse.de/request/show/33532 State of request 33532 was changed by oertel: new -> accepted Comment: Accepted submit request 33532 from user leonardocf Actions: - submit Devel:YaST:Head/yast2-network => SUSE:SLE-12:GA/yast2-network -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [ci_new_pac] JFYI yast2-network -> sle12
by ro 27 Feb '14

27 Feb '14

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-network -> sle12 ## BNC# 865199 : "linuxrc is writing an incorrect ip address/netmask into /etc/sysconfig/network/ifcfg-eth0" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-02-26 16:43:24.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-02-27 12:58:24.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Feb 27 10:44:09 UTC 2014 - mfilka(a)suse.com + +- bnc#865199 + - netmask generated corectly when handling static net + configuration provided by install.inf +- 3.1.26 + +------------------------------------------------------------------- +Wed Feb 26 23:00:17 UTC 2014 - mfilka(a)suse.com + +- fixed internal error in save_network client +- 3.1.25 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-network - at least 14 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old) and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:33532 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-network-3.1.24.tar.bz2 New: ---- yast2-network-3.1.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.f8PT7J/_old 2014-02-27 16:15:27.000000000 +0100 +++ /var/tmp/diff_new_pack.f8PT7J/_new 2014-02-27 16:15:27.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.24 +Version: 3.1.26 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.24.tar.bz2 -> yast2-network-3.1.26.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.24/package/yast2-network.changes new/yast2-network-3.1.26/package/yast2-network.changes --- old/yast2-network-3.1.24/package/yast2-network.changes 2014-02-26 14:49:57.000000000 +0100 +++ new/yast2-network-3.1.26/package/yast2-network.changes 2014-02-27 12:54:59.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Thu Feb 27 10:44:09 UTC 2014 - mfilka(a)suse.com + +- bnc#865199 + - netmask generated corectly when handling static net + configuration provided by install.inf +- 3.1.26 + +------------------------------------------------------------------- +Wed Feb 26 23:00:17 UTC 2014 - mfilka(a)suse.com + +- fixed internal error in save_network client +- 3.1.25 + +------------------------------------------------------------------- Wed Feb 26 13:19:08 UTC 2014 - mfilka(a)suse.com - bnc#859213 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.24/package/yast2-network.spec new/yast2-network-3.1.26/package/yast2-network.spec --- old/yast2-network-3.1.24/package/yast2-network.spec 2014-02-26 14:49:57.000000000 +0100 +++ new/yast2-network-3.1.26/package/yast2-network.spec 2014-02-27 12:54:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.24 +Version: 3.1.26 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.24/src/clients/save_network.rb new/yast2-network-3.1.26/src/clients/save_network.rb --- old/yast2-network-3.1.24/src/clients/save_network.rb 2014-02-26 14:49:57.000000000 +0100 +++ new/yast2-network-3.1.26/src/clients/save_network.rb 2014-02-27 12:54:59.000000000 +0100 @@ -31,6 +31,8 @@ require "network/install_inf_convertor" class SaveNetworkClient < Client + include Logger + def main Yast.import "UI" @@ -57,7 +59,7 @@ save_network else Builtins.y2milestone("update - skip save_network") - end + end # EOF nil @@ -71,7 +73,7 @@ log.info("Network based device: #{network_disk}") # overwrite configuration created during network setup e.g. in InstInstallInfClient - if network_disk == :iscsi && + if network_disk == :iscsi && NetworkStorage.getiBFTDevices.include?( InstallInfConvertor::InstallInf["Netdevice"] ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.24/src/lib/network/install_inf_convertor.rb new/yast2-network-3.1.26/src/lib/network/install_inf_convertor.rb --- old/yast2-network-3.1.24/src/lib/network/install_inf_convertor.rb 2014-02-26 14:49:57.000000000 +0100 +++ new/yast2-network-3.1.26/src/lib/network/install_inf_convertor.rb 2014-02-27 12:54:59.000000000 +0100 @@ -197,7 +197,8 @@ # remember domain, use it as fallback below, if there is no DNS search # domain (#476208) split = Hostname.SplitFQ(hostname) if !hostname.empty? && !IP.Check(hostname) - fqdomain = split[1] if split.size > 1 + fqdomain = "" + fqdomain = split[1].to_s if split serverlist = nameserver # write also secondary and third nameserver when available (bnc#446101) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.24/test/install_inf_convertor_test.rb new/yast2-network-3.1.26/test/install_inf_convertor_test.rb --- old/yast2-network-3.1.24/test/install_inf_convertor_test.rb 2014-02-26 14:49:57.000000000 +0100 +++ new/yast2-network-3.1.26/test/install_inf_convertor_test.rb 2014-02-27 12:54:59.000000000 +0100 @@ -85,33 +85,33 @@ context "linuxrc provides dhcp configuration" do - DEVICE = "enp0s3" - NETCONFIG = "dhcp" - before(:each) do + @device = "enp0s3" + @netconfig = "dhcp" + @install_inf_convertor = Yast::InstallInfConvertor.instance Yast::InstallInfConvertor::InstallInf .stub(:[]) { "" } Yast::InstallInfConvertor::InstallInf .stub(:[]) - .with("Netdevice") { DEVICE } + .with("Netdevice") { @device } Yast::InstallInfConvertor::InstallInf .stub(:[]) - .with("NetConfig") { NETCONFIG } + .with("NetConfig") { @netconfig } end describe "#dev_name" do it "returns expected device name" do - expect(@install_inf_convertor.send(:dev_name)).to eql DEVICE + expect(@install_inf_convertor.send(:dev_name)).to eql @device end end describe "#write_ifcfg" do - it "creates ifcfg file for #{DEVICE}" do + it "creates ifcfg file for #{@device}" do expect(SCR) .to receive(:Write) - .with(path(".target.string"), /.*-#{DEVICE}/, "") { true } + .with(path(".target.string"), /.*-#{@device}/, "") { true } expect(@install_inf_convertor.send(:write_ifcfg, "")).to eql true end end @@ -126,4 +126,73 @@ end end + context "linuxrc provides static configuration" do + + before(:each) do + Yast.import "Netmask" + + @device = "enp0s3" + @ip = "10.121.157.133" + @netmask = "255.255.240.0" + @netconfig = "static" + @nameserver = "10.120.0.1" + + @install_inf_convertor = Yast::InstallInfConvertor.instance + + Yast::InstallInfConvertor::InstallInf + .stub(:[]) { "" } + Yast::InstallInfConvertor::InstallInf + .stub(:[]) + .with("Netdevice") { @device } + Yast::InstallInfConvertor::InstallInf + .stub(:[]) + .with("NetConfig") { @netconfig } + Yast::InstallInfConvertor::InstallInf + .stub(:[]) + .with("IP") { @ip } + Yast::InstallInfConvertor::InstallInf + .stub(:[]) + .with("Netmask") { @netmask } + Yast::InstallInfConvertor::InstallInf + .stub(:[]) + .with("Nameserver") { @nameserver } + end + + describe "#create_ifcfg" do + it "creates a valid ifcfg for netconfig" do + expect(ifcfg = @install_inf_convertor.send(:create_ifcfg)).not_to be_empty + expect(ifcfg).to match /BOOTPROTO='static'/ + expect(ifcfg).to match /IPADDR='#{@ip}\/#{Netmask.ToBits(@netmask)}'/ + end + end + + describe "#write_global_netconfig" do + it "writes all expected configuration" do + expect(@install_inf_convertor) + .to receive(:write_dns) + expect(@install_inf_convertor.send(:write_global_netconfig)) + .to eql nil + end + end + + describe "#write_dns" do + it "updates global netconfig file" do + expect(Yast::SCR) + .to receive(:Write) + .with( + path(".sysconfig.network.config"), + nil + ) { true } + expect(Yast::SCR) + .to receive(:Write) + .with( + path(".sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS"), + @nameserver + ).once { true } + expect(@install_inf_convertor.send(:write_dns)).to eql true + end + end + + end + end continue with "q"... Checked in at Thu Feb 27 16:15:48 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [yast/yast-control-center] 2481b1: Fixed save_y2logs invocation (bnc#866056).
by GitHub 27 Feb '14

27 Feb '14

Branch: refs/heads/master Home: https://github.com/yast/yast-control-center Commit: 2481b19fe45150f9ba8cb6694518f43ba1d63a34 https://github.com/yast/yast-control-center/commit/2481b19fe45150f9ba8cb669… Author: Martin Vidner <mvidner(a)suse.cz> Date: 2014-02-27 (Thu, 27 Feb 2014) Changed paths: M src/yqsavelogs.cpp Log Message: ----------- Fixed save_y2logs invocation (bnc#866056). It was moved from /sbin to /usr/sbin. Commit: 51e4b7ee6ad0992acfca64d6462374b71d65b149 https://github.com/yast/yast-control-center/commit/51e4b7ee6ad0992acfca64d6… Author: Martin Vidner <mvidner(a)suse.cz> Date: 2014-02-27 (Thu, 27 Feb 2014) Changed paths: M package/yast2-control-center.changes M package/yast2-control-center.spec Log Message: ----------- bump Commit: b5ed587bdf8c4e9780d53a3b5509dcfbba2598cc https://github.com/yast/yast-control-center/commit/b5ed587bdf8c4e9780d53a3b… Author: Martin Vidner <martin(a)vidner.net> Date: 2014-02-27 (Thu, 27 Feb 2014) Changed paths: M package/yast2-control-center.changes M package/yast2-control-center.spec M src/yqsavelogs.cpp Log Message: ----------- Merge pull request #7 from yast/save-y2logs-path Fixed save_y2logs invocation (bnc#866056) Compare: https://github.com/yast/yast-control-center/compare/44462e4ec6c9...b5ed587b…

1 0

[yast-commit] Request 33555 changed to accepted (submit SUSE:SLE-12:GA/yast2-installation)
by Ruediger Oertel 27 Feb '14

27 Feb '14

Visit https://build.suse.de/request/show/33555 State of request 33555 was changed by oertel: new -> accepted Comment: Accepted submit request 33555 from user licensedigger Actions: - submit Devel:YaST:Head/yast2-installation => SUSE:SLE-12:GA/yast2-installation -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [ci_new_pac] JFYI yast2-installation -> sle12
by ro 27 Feb '14

27 Feb '14

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(a)suse.de + +- reset proposal after rescanning storage (bnc#865579) +- 3.1.47 + +------------------------------------------------------------------- +Thu Feb 27 13:55:16 UTC 2014 - jreidinger(a)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(a)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(a)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(a)suse.de + +- reset proposal after rescanning storage (bnc#865579) +- 3.1.47 + +------------------------------------------------------------------- +Thu Feb 27 13:55:16 UTC 2014 - jreidinger(a)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(a)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(a)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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] /mounts/work_src_done/SLE12/yast2-bootloader not checked in
by ro 27 Feb '14

27 Feb '14

Script 'mail_helper' called by ro Hi yast-commit(a)opensuse.org, /mounts/work_src_done/SLE12/yast2-bootloader was not checked in by ro for the following reasons: (submitrequest 33525 on https://build.suse.de) request on hold, please do also create a submission to the devel project on OBS (YaST:Head) your dist/autobuild team. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0