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 ## BNC# 870622 : "Build0224: Network configuration button does not open network configuration dialog" (REOPENED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-03-26 18:19:00.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-03-28 11:22:59.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 28 08:20:17 UTC 2014 - mfilka@suse.com + +- bnc#870622 + - fixed handling "Network Configuration" button +- 3.1.24 + +------------------------------------------------------------------- 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:35069 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.23.tar.bz2 New: ---- yast2-registration-3.1.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.a42K79/_old 2014-03-28 12:01:34.000000000 +0100 +++ /var/tmp/diff_new_pack.a42K79/_new 2014-03-28 12:01:34.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.23 +Version: 3.1.24 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.23.tar.bz2 -> yast2-registration-3.1.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.23/package/yast2-registration.changes new/yast2-registration-3.1.24/package/yast2-registration.changes --- old/yast2-registration-3.1.23/package/yast2-registration.changes 2014-03-26 16:59:25.000000000 +0100 +++ new/yast2-registration-3.1.24/package/yast2-registration.changes 2014-03-28 11:34:37.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 28 08:20:17 UTC 2014 - mfilka@suse.com + +- bnc#870622 + - fixed handling "Network Configuration" button +- 3.1.24 + +------------------------------------------------------------------- Tue Mar 25 17:38:37 UTC 2014 - lslezak@suse.cz - use an ERB template instead of ugly Summary module for rendering diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.23/package/yast2-registration.spec new/yast2-registration-3.1.24/package/yast2-registration.spec --- old/yast2-registration-3.1.23/package/yast2-registration.spec 2014-03-26 16:59:25.000000000 +0100 +++ new/yast2-registration-3.1.24/package/yast2-registration.spec 2014-03-28 11:34:37.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.23 +Version: 3.1.24 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.23/src/Makefile.am new/yast2-registration-3.1.24/src/Makefile.am --- old/yast2-registration-3.1.23/src/Makefile.am 2014-03-26 16:59:25.000000000 +0100 +++ new/yast2-registration-3.1.24/src/Makefile.am 2014-03-28 11:34:37.000000000 +0100 @@ -18,7 +18,8 @@ lib/registration/storage.rb \ lib/registration/repo_state.rb \ lib/registration/registration.rb \ - lib/registration/helpers.rb + lib/registration/helpers.rb \ + lib/registration/scc_helpers.rb ylibyastdir = @ylibdir@/yast ylibyast_DATA = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.23/src/clients/inst_scc.rb new/yast2-registration-3.1.24/src/clients/inst_scc.rb --- old/yast2-registration-3.1.23/src/clients/inst_scc.rb 2014-03-26 16:59:25.000000000 +0100 +++ new/yast2-registration-3.1.24/src/clients/inst_scc.rb 2014-03-28 11:34:37.000000000 +0100 @@ -29,6 +29,7 @@ require "registration/exceptions" require "registration/helpers" +require "registration/scc_helpers" require "registration/sw_mgmt" require "registration/repo_state" require "registration/storage" @@ -111,7 +112,7 @@ url = ::Registration::Helpers.registration_url @registration = ::Registration::Registration.new(url) - ::Registration::Helpers.catch_registration_errors do + ::Registration::SccHelpers.catch_registration_errors do Popup.Feedback(_("Registering the System..."), _("Contacting the SUSE Customer Center server")) do @@ -521,7 +522,7 @@ } end - ret = ::Registration::Helpers.catch_registration_errors do + ret = ::Registration::SccHelpers.catch_registration_errors do product_services = ::Registration::Helpers.run_with_feedback( n_("Registering Product...", "Registering Products...", products.size), _("Contacting the SUSE Customer Center server")) do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.23/src/clients/scc_auto.rb new/yast2-registration-3.1.24/src/clients/scc_auto.rb --- old/yast2-registration-3.1.23/src/clients/scc_auto.rb 2014-03-26 16:59:25.000000000 +0100 +++ new/yast2-registration-3.1.24/src/clients/scc_auto.rb 2014-03-28 11:34:37.000000000 +0100 @@ -31,6 +31,8 @@ require "registration/storage" require "registration/registration" +require "registration/helpers" +require "registration/scc_helpers" module Yast class SccAutoClient < Client @@ -157,7 +159,7 @@ end - ret = ::Registration::Helpers.catch_registration_errors do + ret = ::Registration::SccHelpers.catch_registration_errors do # register the system Popup.Feedback(_("Registering the System..."), _("Contacting the SUSE Customer Center server")) do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.23/src/lib/registration/helpers.rb new/yast2-registration-3.1.24/src/lib/registration/helpers.rb --- old/yast2-registration-3.1.23/src/lib/registration/helpers.rb 2014-03-26 16:59:25.000000000 +0100 +++ new/yast2-registration-3.1.24/src/lib/registration/helpers.rb 2014-03-28 11:34:37.000000000 +0100 @@ -23,7 +23,6 @@ require "yast" require "uri" -require "scc_api" module Registration @@ -125,57 +124,9 @@ def self.run_network_configuration log.info "Running network configuration..." - Yast::WFM.call("inst_lan") + Yast::WFM.call("inst_lan", [{"skip_detection" => true}]) end - def self.catch_registration_errors(&block) - begin - yield - true - rescue SccApi::NoNetworkError - # Error popup - if Yast::Mode.installation && Yast::Popup.YesNo( - _("Network is not configured, the registration server cannot be reached.\n" + - "Do you want to configure the network now?") ) - Registration::Helpers::run_network_configuration - end - false - rescue SccApi::NotAuthorized - # Error popup - Yast::Report.Error(_("The email address or the registration\ncode is not valid.")) - false - rescue Timeout::Error - # Error popup - Yast::Report.Error(_("Connection time out.")) - false - rescue SccApi::ErrorResponse => e - # TODO FIXME: display error details from the response - Yast::Report.Error(_("Registration server error.\n\nRetry registration later.")) - false - rescue SccApi::HttpError => e - case e.response - when Net::HTTPClientError - Yast::Report.Error(_("Registration client error.")) - when Net::HTTPServerError - Yast::Report.Error(_("Registration server error.\n\nRetry registration later.")) - else - Yast::Report.Error(_("Registration failed.")) - end - false - rescue ::Registration::ServiceError => e - log.error("Service error: #{e.message % e.service}") - Yast::Report.Error(_(e.message) % e.service) - false - rescue ::Registration::PkgError => e - log.error("Pkg error: #{e.message}") - Yast::Report.Error(_(e.message)) - false - rescue Exception => e - log.error("SCC registration failed: #{e}, #{e.backtrace}") - Yast::Report.Error(_("Registration failed.")) - false - end - end private @@ -216,12 +167,10 @@ end def self.slp_discovery_feedback - Yast::Popup.ShowFeedback(_("Searching..."), _("Looking up local registration servers...")) - slp_discovery - ensure - Yast::Popup.ClearFeedback + Yast::Popup.Feedback(_("Searching..."), _("Looking up local registration servers...")) do + slp_discovery + end end - end -end \ No newline at end of file +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.23/src/lib/registration/scc_helpers.rb new/yast2-registration-3.1.24/src/lib/registration/scc_helpers.rb --- old/yast2-registration-3.1.23/src/lib/registration/scc_helpers.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.24/src/lib/registration/scc_helpers.rb 2014-03-28 11:34:37.000000000 +0100 @@ -0,0 +1,92 @@ +# 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 "scc_api" + +require "registration/helpers" +require "registration/exceptions" + +module Registration + + class SccHelpers + include Yast::Logger + extend Yast::I18n + + textdomain "registration" + + Yast.import "Mode" + Yast.import "Popup" + Yast.import "Report" + + def self.catch_registration_errors(&block) + begin + yield + true + rescue SccApi::NoNetworkError + # Error popup + if Yast::Mode.installation && Yast::Popup.YesNo( + _("Network is not configured, the registration server cannot be reached.\n" + + "Do you want to configure the network now?") ) + Registration::Helpers::run_network_configuration + end + false + rescue SccApi::NotAuthorized + # Error popup + Yast::Report.Error(_("The email address or the registration\ncode is not valid.")) + false + rescue Timeout::Error + # Error popup + Yast::Report.Error(_("Connection time out.")) + false + rescue SccApi::ErrorResponse => e + # TODO FIXME: display error details from the response + Yast::Report.Error(_("Registration server error.\n\nRetry registration later.")) + false + rescue SccApi::HttpError => e + case e.response + when Net::HTTPClientError + Yast::Report.Error(_("Registration client error.")) + when Net::HTTPServerError + Yast::Report.Error(_("Registration server error.\n\nRetry registration later.")) + else + Yast::Report.Error(_("Registration failed.")) + end + false + rescue ::Registration::ServiceError => e + log.error("Service error: #{e.message % e.service}") + Yast::Report.Error(_(e.message) % e.service) + false + rescue ::Registration::PkgError => e + log.error("Pkg error: #{e.message}") + Yast::Report.Error(_(e.message)) + false + rescue Exception => e + log.error("SCC registration failed: #{e}, #{e.backtrace}") + Yast::Report.Error(_("Registration failed.")) + false + end + end + + end +end continue with "q"... Checked in at Fri Mar 28 12:01:39 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