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# 882573 : "Registering against SMT with improper certificate leads in weird error" (RESOLVED/FIXED)
## BNC# 883138 : "yast2-registration/SMT: UI for specifying a local registration server" (RESOLVED/FIXED)
## BNC# 882034 : "No Beta info shown for Modules/Add-ons during registration" (NEEDINFO/)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-06-16 20:01:41.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-06-24 13:29:36.000000000 +0200
@@ -1,0 +2,16 @@
+Fri Jun 20 10:24:04 UTC 2014 - lslezak@suse.cz
+
+- display SSL error details from exception, hide the details
+ section if there are no details actually (bnc#882573)
+- send correct base product name when downloading available
+ extensions (fix by Michael Calmer)
+- do not log the registration code to y2log
+- use the new suse-connect SSL API (0.1.2)
+- fixed selecting extensions when going back in the installation
+ workflow
+- added a popup for changing the registration server URL
+ (bnc#883138)
+- removed Beta warning workaround (bnc#882034)
+- 3.1.77
+
+-------------------------------------------------------------------
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:39931 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org"
Old:
----
yast2-registration-3.1.76.tar.bz2
New:
----
yast2-registration-3.1.77.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.x6syzr/_old 2014-06-24 15:59:27.000000000 +0200
+++ /var/tmp/diff_new_pack.x6syzr/_new 2014-06-24 15:59:27.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 3.1.76
+Version: 3.1.77
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -31,7 +31,7 @@
Requires: yast2-pkg-bindings >= 2.17.20
# N_() method
Requires: yast2-ruby-bindings >= 3.1.12
-Requires: rubygem-suse-connect >= 0.1.0
+Requires: rubygem-suse-connect >= 0.1.2
Requires: yast2-slp >= 3.1.2
Requires: yast2-add-on >= 3.1.8
Requires: yast2-packager >= 3.1.22
@@ -41,7 +41,7 @@
BuildRequires: yast2-devtools >= 3.1.6
BuildRequires: rubygem-yast-rake >= 0.1.8
BuildRequires: rubygem-rspec
-BuildRequires: rubygem-suse-connect >= 0.1.0
+BuildRequires: rubygem-suse-connect >= 0.1.2
BuildRequires: yast2-slp >= 3.1.2
BuildRequires: yast2-packager >= 3.1.22
++++++ yast2-registration-3.1.76.tar.bz2 -> yast2-registration-3.1.77.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.76/package/yast2-registration.changes new/yast2-registration-3.1.77/package/yast2-registration.changes
--- old/yast2-registration-3.1.76/package/yast2-registration.changes 2014-06-16 18:26:12.000000000 +0200
+++ new/yast2-registration-3.1.77/package/yast2-registration.changes 2014-06-24 13:22:41.000000000 +0200
@@ -1,4 +1,20 @@
-------------------------------------------------------------------
+Fri Jun 20 10:24:04 UTC 2014 - lslezak@suse.cz
+
+- display SSL error details from exception, hide the details
+ section if there are no details actually (bnc#882573)
+- send correct base product name when downloading available
+ extensions (fix by Michael Calmer)
+- do not log the registration code to y2log
+- use the new suse-connect SSL API (0.1.2)
+- fixed selecting extensions when going back in the installation
+ workflow
+- added a popup for changing the registration server URL
+ (bnc#883138)
+- removed Beta warning workaround (bnc#882034)
+- 3.1.77
+
+-------------------------------------------------------------------
Mon Jun 16 16:05:20 UTC 2014 - lslezak@suse.cz
- fixed crash (nil error) when reading available extensions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.76/package/yast2-registration.spec new/yast2-registration-3.1.77/package/yast2-registration.spec
--- old/yast2-registration-3.1.76/package/yast2-registration.spec 2014-06-16 18:26:12.000000000 +0200
+++ new/yast2-registration-3.1.77/package/yast2-registration.spec 2014-06-24 13:22:41.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 3.1.76
+Version: 3.1.77
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -31,7 +31,7 @@
Requires: yast2-pkg-bindings >= 2.17.20
# N_() method
Requires: yast2-ruby-bindings >= 3.1.12
-Requires: rubygem-suse-connect >= 0.1.0
+Requires: rubygem-suse-connect >= 0.1.2
Requires: yast2-slp >= 3.1.2
Requires: yast2-add-on >= 3.1.8
Requires: yast2-packager >= 3.1.22
@@ -41,7 +41,7 @@
BuildRequires: yast2-devtools >= 3.1.6
BuildRequires: rubygem-yast-rake >= 0.1.8
BuildRequires: rubygem-rspec
-BuildRequires: rubygem-suse-connect >= 0.1.0
+BuildRequires: rubygem-suse-connect >= 0.1.2
BuildRequires: yast2-slp >= 3.1.2
BuildRequires: yast2-packager >= 3.1.22
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.76/src/clients/inst_scc.rb new/yast2-registration-3.1.77/src/clients/inst_scc.rb
--- old/yast2-registration-3.1.76/src/clients/inst_scc.rb 2014-06-16 18:26:13.000000000 +0200
+++ new/yast2-registration-3.1.77/src/clients/inst_scc.rb 2014-06-24 13:22:41.000000000 +0200
@@ -36,6 +36,7 @@
require "registration/registration"
require "registration/ui/addon_eula_dialog"
require "registration/ui/addon_selection_dialog"
+require "registration/ui/local_server_dialog"
module Yast
class InstSccClient < Client
@@ -108,6 +109,13 @@
case ret
when :network
::Registration::Helpers::run_network_configuration
+ when :local_server
+ options = ::Registration::Storage::InstallationOptions.instance
+ url = ::Registration::UI::LocalServerDialog.run(options.custom_url)
+ if url
+ log.info "Entered custom URL: #{url}"
+ options.custom_url = url
+ end
when :next
options = ::Registration::Storage::InstallationOptions.instance
@@ -130,7 +138,7 @@
init_registration
- ::Registration::SccHelpers.catch_registration_errors do
+ success = ::Registration::SccHelpers.catch_registration_errors do
base_product = ::Registration::SwMgmt.find_base_product
distro_target = base_product["register_target"]
@@ -164,6 +172,13 @@
return :next
end
+
+ if !success
+ log.info "registration failed, resetting the registration URL"
+ # reset the registration object and the cache to allow changing the URL
+ @registration = nil
+ ::Registration::Helpers::reset_registration_url
+ end
end
if ret == :skip && confirm_skipping
@@ -267,8 +282,14 @@
MinWidth(REG_CODE_WIDTH, InputField(Id(:reg_code), _("Registration &Code"), options.reg_code))
)
),
- VSpacing(UI.TextMode ? 1 : 3),
- registered ? Empty() : PushButton(Id(:skip), _("&Skip Registration")),
+ registered ? Empty() : VBox(
+ VSpacing(1),
+ # button label
+ PushButton(Id(:local_server), _("&Local Registration Server...")),
+ VSpacing(UI.TextMode ? 1 : 3),
+ # button label
+ PushButton(Id(:skip), _("&Skip Registration"))
+ ),
VStretch()
)
end
@@ -368,15 +389,15 @@
VBox(
VStretch(),
Left(Label(n_(
- "The extension you selected needs a separate registration code.",
- "The extensions you selected need separate registration codes.",
- addons.size
- ))),
+ "The extension you selected needs a separate registration code.",
+ "The extensions you selected need separate registration codes.",
+ addons.size
+ ))),
Left(Label(n_(
- "Enter the registration code into the field below.",
- "Enter the registration codes into the fields below.",
- addons.size
- ))),
+ "Enter the registration code into the field below.",
+ "Enter the registration codes into the fields below.",
+ addons.size
+ ))),
VStretch(),
HBox(
box1,
@@ -436,27 +457,13 @@
# register all selected addons
def register_selected_addons
- registration_order = @selected_addons.clone #create duplicate as array is modified in loop for registration order
- # TODO FIXME: SCC does not report dependoencies
- # begin
- # # compute the registration order according to the dependencies
- # registration_order = Registration::AddonSorter.registration_order(@selected_addons)
- # rescue KeyError
- # # Continuew/Cancel dialog: missing dependency error
- # if Popup.ContinueCancel(_("Addon dependencies cannot be solved.\n" +
- # "Register without solving dependencies?"))
- # # just try the current order it might work
- # else
- # return false
- # end
- # end
- #
- # log.info "Addon registration order: #{registration_order.map(&:name)}"
+ # create duplicate as array is modified in loop for registration order
+ registration_order = @selected_addons.clone
init_registration
product_succeed = registration_order.map do |product|
- ::Registration::SccHelpers.catch_registration_errors("#{product.label}:") do
+ ::Registration::SccHelpers.catch_registration_errors("#{product.label}\n") do
product_service = Popup.Feedback(
_(CONTACTING_MESSAGE),
# %s is name of given product
@@ -476,7 +483,7 @@
select_repositories(product_service) if Mode.installation || Mode.update
# move from selected to registered
- registered_addons << product.identifier
+ product.registered
@selected_addons.reject!{|selected| selected.identifier == product.identifier}
end
end
@@ -664,11 +671,6 @@
end
end
- # helper method for accessing the registered addons
- def registered_addons
- Registration::Addon.registered
- end
-
def first_run
if ::Registration::Storage::Cache.instance.first_run
::Registration::Storage::Cache.instance.first_run = false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.76/src/lib/registration/addon.rb new/yast2-registration-3.1.77/src/lib/registration/addon.rb
--- old/yast2-registration-3.1.76/src/lib/registration/addon.rb 2014-06-16 18:26:13.000000000 +0200
+++ new/yast2-registration-3.1.77/src/lib/registration/addon.rb 2014-06-24 13:22:41.000000000 +0200
@@ -95,11 +95,39 @@
Addon.registered.include?(self)
end
+ def registered
+ Addon.registered << self unless registered?
+ end
+
# get a product printable name (long name if present, fallbacks to the short name)
# @return [String] label usable in UI
def label
(friendly_name && !friendly_name.empty?) ? friendly_name : name
end
+ # can be the addon selected in UI or should it be disabled?
+ # return [Boolean] true if it should be enabled
+ def selectable?
+ # Do not support unregister
+ return false if registered?
+ # Do not select not available addons
+ return false if !available?
+ # Do not allow to select child without selected or already registered parent
+ return false if depends_on && !(depends_on.selected? || depends_on.registered?)
+ # Do not allow to unselect parent if any children is selected
+ return false if children.any?(&:selected?)
+
+ return true
+ end
+
+ # is the addon available? SMT may have mirrored only some extensions,
+ # the not mirrored extensions are marked as not available
+ # @return [Boolean] true if the addon is available to register
+ def available?
+ # explicitly check for false, undefined (nil) means it is available,
+ # it's only reported by SMT
+ @pure_addon.available != false
+ end
+
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.76/src/lib/registration/connect_helpers.rb new/yast2-registration-3.1.77/src/lib/registration/connect_helpers.rb
--- old/yast2-registration-3.1.76/src/lib/registration/connect_helpers.rb 2014-06-16 18:26:13.000000000 +0200
+++ new/yast2-registration-3.1.77/src/lib/registration/connect_helpers.rb 2014-06-24 13:22:41.000000000 +0200
@@ -113,6 +113,7 @@
# the original error message from openSSL
msg = UI::ImportCertificateDialog::OPENSSL_ERROR_MESSAGES[error_code]
msg = msg ? _(msg) : Storage::SSLErrors.instance.ssl_error_msg
+ msg = e.message if msg.nil? || msg.empty?
Yast::Report.Error(
error_with_details(_("Secure connection error: %s") % msg, ssl_error_details)
@@ -144,10 +145,11 @@
def self.ssl_error_details()
# label follwed by a certificate description
- details = [ _("Certificate:") ]
+ details = []
cert = Storage::SSLErrors.instance.ssl_failed_cert
if cert
+ details << _("Certificate:")
details << _("Issued To")
details.concat(cert_name_details(cert.subject))
details << ""
@@ -155,10 +157,10 @@
details.concat(cert_name_details(cert.issuer))
details << ""
details << _("SHA1 Fingerprint: ")
- details << INDENT + ::SUSE::Connect::SSLCertificate.sha1_fingerprint(cert)
+ details << INDENT + ::SUSE::Connect::YaST.cert_sha1_fingerprint(cert)
details << _("SHA256 Fingerprint: ")
- sha256 = ::SUSE::Connect::SSLCertificate.sha256_fingerprint(cert)
+ sha256 = ::SUSE::Connect::YaST.cert_sha256_fingerprint(cert)
if Yast::UI.TextMode && Yast::UI.GetDisplayInfo["Width"] < 105
# split the long SHA256 digest to two lines in small text mode UI
details << INDENT + sha256[0..59]
@@ -168,7 +170,7 @@
end
end
- "\n\n" + details.join("\n")
+ details.empty? ? "" : ("\n\n" + details.join("\n"))
end
def self.cert_name_details(x509_name)
@@ -194,7 +196,7 @@
result = Yast::Popup.Feedback(_("Importing the SSL certificate"),
_("Importing '%s' certificate...") % cn) do
- ::SUSE::Connect::SSLCertificate.import(cert)
+ ::SUSE::Connect::YaST.import_certificate(cert)
end
log.info "Certificate import result: #{result}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.76/src/lib/registration/helpers.rb new/yast2-registration-3.1.77/src/lib/registration/helpers.rb
--- old/yast2-registration-3.1.76/src/lib/registration/helpers.rb 2014-06-16 18:26:13.000000000 +0200
+++ new/yast2-registration-3.1.77/src/lib/registration/helpers.rb 2014-06-24 13:22:42.000000000 +0200
@@ -98,6 +98,11 @@
url
end
+ def self.reset_registration_url
+ ::Registration::Storage::Cache.instance.reg_url = nil
+ ::Registration::Storage::Cache.instance.reg_url_cached = false
+ end
+
# convert service URL to plain URL, remove the SLP service prefix
# "service:registration.suse:smt:https://scc.suse.com/connect" ->
# "https://scc.suse.com/connect"
@@ -142,6 +147,9 @@
# get registration URL in installation mode
def self.reg_url_at_installation
+ custom_url = ::Registration::Storage::InstallationOptions.instance.custom_url
+ return custom_url if custom_url && !custom_url.empty?
+
# boot command line if present
boot_url = boot_reg_url
return boot_url if boot_url
@@ -173,6 +181,9 @@
# get registration URL in running system
def self.reg_url_at_runnig_system
+ custom_url = ::Registration::Storage::InstallationOptions.instance.custom_url
+ return custom_url if custom_url && !custom_url.empty?
+
# TODO FIXME: read the URL from configuration file to use the same URL
# at re-registration as in installation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.76/src/lib/registration/registration.rb new/yast2-registration-3.1.77/src/lib/registration/registration.rb
--- old/yast2-registration-3.1.76/src/lib/registration/registration.rb 2014-06-16 18:26:13.000000000 +0200
+++ new/yast2-registration-3.1.77/src/lib/registration/registration.rb 2014-06-24 13:22:42.000000000 +0200
@@ -59,7 +59,10 @@
def register_product(product, email = nil)
service_for_product(product) do |product_ident, params|
- log.info "Registering product: #{product}"
+ log_product = product.dup
+ log_product["reg_code"] = "[FILTERED]" if log_product["reg_code"]
+ log.info "Registering product: #{log_product}"
+
service = SUSE::Connect::YaST.activate_product(product_ident, params, email)
log.info "Register product result: #{service}"
service
@@ -77,7 +80,7 @@
def get_addon_list
# extensions for base product
- base_product = ::Registration::SwMgmt.find_base_product
+ base_product = ::Registration::SwMgmt.base_product_to_register
log.info "Reading available addons for product: #{base_product["name"]}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.76/src/lib/registration/storage.rb new/yast2-registration-3.1.77/src/lib/registration/storage.rb
--- old/yast2-registration-3.1.76/src/lib/registration/storage.rb 2014-06-16 18:26:13.000000000 +0200
+++ new/yast2-registration-3.1.77/src/lib/registration/storage.rb 2014-06-24 13:22:42.000000000 +0200
@@ -38,7 +38,8 @@
class InstallationOptions
include Singleton
- attr_accessor :install_updates, :email, :reg_code, :selected_addons, :base_registered
+ attr_accessor :install_updates, :email, :reg_code, :selected_addons,
+ :base_registered, :custom_url
def initialize
@email = ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.76/src/lib/registration/ui/addon_eula_dialog.rb new/yast2-registration-3.1.77/src/lib/registration/ui/addon_eula_dialog.rb
--- old/yast2-registration-3.1.76/src/lib/registration/ui/addon_eula_dialog.rb 2014-06-16 18:26:13.000000000 +0200
+++ new/yast2-registration-3.1.77/src/lib/registration/ui/addon_eula_dialog.rb 2014-06-24 13:22:42.000000000 +0200
@@ -100,8 +100,11 @@
Yast::ProductLicense.DisplayLicenseDialogWithTitle(eulas.keys, enable_back,
eula_lang(eulas.keys), arg_ref(eulas), id, title)
- # TODO FIXME: this a workaround, remove before RC/GM!!
- display_beta_warning(addon.label)
+ # display info file if present
+ display_optional_info(File.join(tmpdir, "info.txt"))
+
+ # display beta warning if present
+ display_optional_info(File.join(tmpdir, "README.BETA"))
base_product = false
action = "abort"
@@ -159,36 +162,10 @@
code.sub(/_.*\z/, "")
end
- # TODO FIXME: this a workaround, remove before RC/GM!!
- def display_beta_warning(addon_name)
- beta_warning = <