Mailinglist Archive: yast-commit (1271 mails)

< Previous Next >
[yast-commit] [ci_new_pac] JFYI yast2-registration -> 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-registration
-> sle12



## BNC# 894877 : "AutoYaST: Registration failed with an error" (RESOLVED/FIXED)

Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes
2014-09-03 16:39:54.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes
2014-09-04 09:08:55.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 4 06:58:14 UTC 2014 - jreidinger@xxxxxxxx
+
+- avoid crash in autoinstallation with method called on nil
+ (bnc#894877)
+- 3.1.116
+
+-------------------------------------------------------------------

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:43569
MAIL:yast-commit@xxxxxxxxxxxx) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-registration", Maintainer is "yast-commit@xxxxxxxxxxxx"


Old:
----
yast2-registration-3.1.115.tar.bz2

New:
----
yast2-registration-3.1.116.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.79xjY3/_old 2014-09-04 11:32:13.000000000 +0200
+++ /var/tmp/diff_new_pack.79xjY3/_new 2014-09-04 11:32:13.000000000 +0200
@@ -17,7 +17,7 @@


Name: yast2-registration
-Version: 3.1.115
+Version: 3.1.116
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build

++++++ yast2-registration-3.1.115.tar.bz2 -> yast2-registration-3.1.116.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-3.1.115/package/yast2-registration.changes
new/yast2-registration-3.1.116/package/yast2-registration.changes
--- old/yast2-registration-3.1.115/package/yast2-registration.changes
2014-09-03 09:46:06.000000000 +0200
+++ new/yast2-registration-3.1.116/package/yast2-registration.changes
2014-09-04 09:59:34.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Sep 4 06:58:14 UTC 2014 - jreidinger@xxxxxxxx
+
+- avoid crash in autoinstallation with method called on nil
+ (bnc#894877)
+- 3.1.116
+
+-------------------------------------------------------------------
Tue Sep 2 15:30:07 UTC 2014 - lslezak@xxxxxxx

- do not log the registration code or the credentials to y2log
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-3.1.115/package/yast2-registration.spec
new/yast2-registration-3.1.116/package/yast2-registration.spec
--- old/yast2-registration-3.1.115/package/yast2-registration.spec
2014-09-03 09:46:07.000000000 +0200
+++ new/yast2-registration-3.1.116/package/yast2-registration.spec
2014-09-04 09:59:34.000000000 +0200
@@ -17,7 +17,7 @@


Name: yast2-registration
-Version: 3.1.115
+Version: 3.1.116
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-registration-3.1.115/src/clients/scc_auto.rb
new/yast2-registration-3.1.116/src/clients/scc_auto.rb
--- old/yast2-registration-3.1.115/src/clients/scc_auto.rb 2014-09-03
09:46:08.000000000 +0200
+++ new/yast2-registration-3.1.116/src/clients/scc_auto.rb 2014-09-04
09:59:34.000000000 +0200
@@ -162,7 +162,7 @@
end

# nil = use the default URL
- @registration = ::Registration::Registration.new(url)
+ switch_registration(url)

ret = ::Registration::ConnectHelpers.catch_registration_errors do
if @config.reg_server_cert && !@config.reg_server_cert.empty?
@@ -237,12 +237,28 @@
::Registration::UI::AutoyastConfigWorkflow.run(@config)
end

- def update_registration
- url = ::Registration::UrlHelpers.registration_url
- log.info "Updating registration using URL: #{url}"
+ def switch_registration(url = nil)
@registration = ::Registration::Registration.new(url)
- @registration_ui = ::Registration::RegistrationUI.new(@registration)
+ #reset registration ui as it depends on registration
+ @registration_ui = nil
+ @registration
+ end
+
+ def registration
+ if !@registration
+ url = ::Registration::UrlHelpers.registration_url
+ log.info "Updating registration using URL: #{url}"
+ @registration = switch_registration(url)
+ end

+ @registration
+ end
+
+ def registration_ui
+ @registration_ui ||= ::Registration::RegistrationUI.new(registration)
+ end
+
+ def update_registration
# the old system was not registered
return false unless prepare_update

@@ -256,7 +272,7 @@
# TODO FIXME: share these methods with inst_scc.rb

def register_base_product
- @registration_ui.register_system_and_base_product(@config.email,
@config.reg_code,
+ registration_ui.register_system_and_base_product(@config.email,
@config.reg_code,
disable_updates: !@config.install_updates)
end

@@ -268,12 +284,12 @@
# %s is name of given product
_("Registering %s ...") % addon["name"]) do

- @registration.register_product(addon)
+ registration.register_product(addon)
end

::Registration::Storage::Cache.instance.addon_services <<
product_service

- @registration_ui.disable_update_repos(product_service) if
!@config.install_updates
+ registration_ui.disable_update_repos(product_service) if
!@config.install_updates
end

# install the new products
@@ -289,15 +305,15 @@

# @return [Boolean] true on success
def update_base_product
- @registration_ui.update_base_product(enable_updates:
@config.install_updates)
+ registration_ui.update_base_product(enable_updates:
@config.install_updates)
end

# @return [Boolean] true on success
# TODO FIXME share with inst_scc.rb
def update_addons
- addons = @registration_ui.get_available_addons
+ addons = registration_ui.get_available_addons

- failed_addons = @registration_ui.update_addons(addons, enable_updates:
@config.install_updates)
+ failed_addons = registration_ui.update_addons(addons, enable_updates:
@config.install_updates)
failed_addons.empty?
end

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-3.1.115/src/lib/registration/ui/addon_eula_dialog.rb
new/yast2-registration-3.1.116/src/lib/registration/ui/addon_eula_dialog.rb
--- old/yast2-registration-3.1.115/src/lib/registration/ui/addon_eula_dialog.rb
2014-09-03 09:46:12.000000000 +0200
+++ new/yast2-registration-3.1.116/src/lib/registration/ui/addon_eula_dialog.rb
2014-09-04 09:59:34.000000000 +0200
@@ -63,55 +63,77 @@

private

- # ask user to accept an addon EULA
- # @param addon [SUSE::Connect::Product] the addon
- # @return [Symbol] :accepted, :back, :abort, :halt
- def accept_eula(addon)
- Dir.mktmpdir("extension-eula-") do |tmpdir|
- begin
- Yast::Popup.Feedback(
- _("Downloading License Agreement..."),
- addon.label
- ) do
- # download the license (with translations)
- loader = EulaDownloader.new(addon.eula_url, tmpdir,
- insecure: Helpers.insecure_registration)
-
- loader.download
- end
- rescue Exception => e
- log.error "Download failed: #{e.message}: #{e.backtrace}"
- # %s is an extension name, e.g. "SUSE Linux Enterprise Software
Development Kit"
- Yast::Report.Error(_("Downloading the license for\n%s\nfailed.") %
addon.label)
- return false
- end
-
- id = "#{addon.label} extension EULA"
- Yast::ProductLicense.SetAcceptanceNeeded(id, true)
- Yast::ProductLicense.license_file_print = addon.eula_url
+ # download the addon EULAs to a temp dir
+ # @param [SUSE::Connect::Product] addon the addon
+ # @param [String] tmpdir target where to download the files
+ def download_eula(addon, tmpdir)
+ begin
+ Yast::Popup.Feedback(
+ _("Downloading License Agreement..."),
+ addon.label
+ ) do
+ # download the license (with translations)
+ loader = EulaDownloader.new(addon.eula_url, tmpdir,
+ insecure: Helpers.insecure_registration)

+ loader.download
+ end
+ true
+ rescue Exception => e
+ log.error "Download failed: #{e.message}: #{e.backtrace}"
# %s is an extension name, e.g. "SUSE Linux Enterprise Software
Development Kit"
- title = _("%s License Agreement") % addon.label
- eulas = read_downloaded_eulas(tmpdir)
- enable_back = true
+ Yast::Report.Error(_("Downloading the license for\n%s\nfailed.") %
addon.label)
+ return false
+ end
+ end

- Yast::ProductLicense.DisplayLicenseDialogWithTitle(eulas.keys,
enable_back,
- eula_lang(eulas.keys), arg_ref(eulas), id, title)
+ # prepare data for displaying the EULA dialog
+ # @param [SUSE::Connect::Product] addon the addon
+ # @param [Hash<String,String>] eulas mapping { <locale> => <file_name> }
+ # @param [String] tmpdir target with the downloaded files
+ def setup_eula_dialog(addon, eulas, tmpdir)
+ id = "#{addon.label} extension EULA"
+ Yast::ProductLicense.SetAcceptanceNeeded(id, true)
+ Yast::ProductLicense.license_file_print = addon.eula_url
+
+ # %s is an extension name, e.g. "SUSE Linux Enterprise Software
Development Kit"
+ title = _("%s License Agreement") % addon.label
+ enable_back = true
+ Yast::ProductLicense.DisplayLicenseDialogWithTitle(eulas.keys,
enable_back,
+ eula_lang(eulas.keys), arg_ref(eulas), id, title)

- # display info file if present
- display_optional_info(File.join(tmpdir, "info.txt"))
+ # 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"))
+ # display beta warning if present
+ display_optional_info(File.join(tmpdir, "README.BETA"))
+ end

- base_product = false
- action = "abort"
- ret = Yast::ProductLicense.HandleLicenseDialogRet(arg_ref(eulas),
base_product, action)
- log.debug "EULA dialog result: #{ret}"
- Yast::ProductLicense.CleanUp()
+ # run the EULA agreement dialog
+ # @param [Hash<String,String>] eulas mapping { <locale> => <file_name> }
+ # @return [Symbol] :accepted, :back, :abort, :halt - user input
+ def run_eula_dialog(eulas)
+ base_product = false
+ cancel_action = "abort"
+ ret = Yast::ProductLicense.HandleLicenseDialogRet(arg_ref(eulas),
+ base_product, cancel_action)
+ log.debug "EULA dialog result: #{ret}"
+ ret
+ end
+
+ # ask user to accept an addon EULA
+ # @param [SUSE::Connect::Product] addon the addon
+ # @return [Symbol] :accepted, :back, :abort, :halt
+ def accept_eula(addon)
+ Dir.mktmpdir("extension-eula-") do |tmpdir|
+ return false unless download_eula(addon, tmpdir)
+ eulas = read_downloaded_eulas(tmpdir)

- ret
+ setup_eula_dialog(addon, eulas, tmpdir)
+ run_eula_dialog(eulas)
end
+ ensure
+ Yast::ProductLicense.CleanUp()
end

# get the EULA translation to display

continue with "q"...


Checked in at Thu Sep 4 11:32:19 CEST 2014 by ro

Remember to have fun...

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread