[yast-commit] [ci_new_pac] JFYI yast2-registration -> sle12
Script 'mail_helper' called by bg
Hello packager,
This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: bg.
Here comes the log...
---------------------------%<------------------------------
Hi,
here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-registration -> sle12
## BNC# 881627 : "Extensions screen should be renamed to reflect it's dual purpose - SLES12 Beta7" (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-10 15:14:49.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-06-11 16:23:10.000000000 +0200
@@ -1,0 +2,19 @@
+Tue Jun 11 14:22:07 UTC 2014 - jreidinger@suse.com
+
+- write changes at the end of installation for suse connect
+- 3.1.72
+
+-------------------------------------------------------------------
+Mon Jun 11 12:52:44 UTC 2014 - lslezak@suse.cz
+
+- updated dialog title (extension selection) (bnc#881627)
+- 3.1.71
+
+-------------------------------------------------------------------
+Wed Jun 11 12:42:53 UTC 2014 - lslezak@suse.cz
+
+- display a fixed Beta warning for all online extensions
+ (temporary workaround for bnc#882034)
+- 3.1.70
+
+-------------------------------------------------------------------
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:39319 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org"
Old:
----
yast2-registration-3.1.69.tar.bz2
New:
----
yast2-registration-3.1.72.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.KQYi4s/_old 2014-06-12 14:36:34.000000000 +0200
+++ /var/tmp/diff_new_pack.KQYi4s/_new 2014-06-12 14:36:34.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 3.1.69
+Version: 3.1.72
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.0.19
+Requires: rubygem-suse-connect >= 0.0.20
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.0.19
+BuildRequires: rubygem-suse-connect >= 0.0.20
BuildRequires: yast2-slp >= 3.1.2
BuildRequires: yast2-packager >= 3.1.22
++++++ yast2-registration-3.1.69.tar.bz2 -> yast2-registration-3.1.72.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.69/package/yast2-registration.changes new/yast2-registration-3.1.72/package/yast2-registration.changes
--- old/yast2-registration-3.1.69/package/yast2-registration.changes 2014-06-10 11:13:02.000000000 +0200
+++ new/yast2-registration-3.1.72/package/yast2-registration.changes 2014-06-11 16:21:21.000000000 +0200
@@ -1,4 +1,23 @@
-------------------------------------------------------------------
+Tue Jun 11 14:22:07 UTC 2014 - jreidinger@suse.com
+
+- write changes at the end of installation for suse connect
+- 3.1.72
+
+-------------------------------------------------------------------
+Mon Jun 11 12:52:44 UTC 2014 - lslezak@suse.cz
+
+- updated dialog title (extension selection) (bnc#881627)
+- 3.1.71
+
+-------------------------------------------------------------------
+Wed Jun 11 12:42:53 UTC 2014 - lslezak@suse.cz
+
+- display a fixed Beta warning for all online extensions
+ (temporary workaround for bnc#882034)
+- 3.1.70
+
+-------------------------------------------------------------------
Mon Jun 9 11:26:18 UTC 2014 - lslezak@suse.cz
- display where to download the extension EULA text (bnc#880685)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.69/package/yast2-registration.spec new/yast2-registration-3.1.72/package/yast2-registration.spec
--- old/yast2-registration-3.1.69/package/yast2-registration.spec 2014-06-10 11:13:03.000000000 +0200
+++ new/yast2-registration-3.1.72/package/yast2-registration.spec 2014-06-11 16:21:21.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 3.1.69
+Version: 3.1.72
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.0.19
+Requires: rubygem-suse-connect >= 0.0.20
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.0.19
+BuildRequires: rubygem-suse-connect >= 0.0.20
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.69/src/clients/scc_finish.rb new/yast2-registration-3.1.72/src/clients/scc_finish.rb
--- old/yast2-registration-3.1.69/src/clients/scc_finish.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-3.1.72/src/clients/scc_finish.rb 2014-06-11 16:21:21.000000000 +0200
@@ -0,0 +1,3 @@
+require "registration/finish_dialog"
+
+::Registration::FinishDialog.new.run(*Yast::WFM.Args)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.69/src/lib/registration/addon.rb new/yast2-registration-3.1.72/src/lib/registration/addon.rb
--- old/yast2-registration-3.1.69/src/lib/registration/addon.rb 2014-06-10 11:13:03.000000000 +0200
+++ new/yast2-registration-3.1.72/src/lib/registration/addon.rb 2014-06-11 16:21:21.000000000 +0200
@@ -62,7 +62,17 @@
attr_reader :children
attr_accessor :depends_on, :regcode
- def_delegators :@pure_addon, :free, :product_ident, :short_name, :long_name, :description, :eula_url
+ # delegate methods to underlaying suse connect object
+ def_delegators :@pure_addon,
+ :arch,
+ :description,
+ :eula_url,
+ :free,
+ :long_name,
+ :product_ident,
+ :short_name,
+ :version
+
def initialize pure_addon
@pure_addon = pure_addon
@children = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.69/src/lib/registration/finish_dialog.rb new/yast2-registration-3.1.72/src/lib/registration/finish_dialog.rb
--- old/yast2-registration-3.1.69/src/lib/registration/finish_dialog.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-3.1.72/src/lib/registration/finish_dialog.rb 2014-06-11 16:21:21.000000000 +0200
@@ -0,0 +1,66 @@
+require "yast"
+require "suse/connect"
+
+require "registration/helpers"
+require "registration/registration"
+
+module Registration
+ class FinishDialog
+ include Yast::Logger
+ include Yast::I18n
+
+ USABLE_WORKFLOWS = [
+ :installation,
+ :live_installation,
+ :autoinst,
+ :update,
+ ]
+
+ def initialize
+ textdomain "registration"
+ end
+
+ def run(*args)
+ func = args.first
+ param = args[1] || {}
+
+ log.debug "registration finish client called with #{func} and #{param}"
+
+ case func
+ when "Info"
+ {
+ "steps" => 1,
+ # progress step title
+ "title" => _(
+ "Storing Registration Configuration..."
+ ),
+ "when" => USABLE_WORKFLOWS
+ }
+
+ when "Write"
+ # do not write anything if registration was skipped
+ return nil unless Registration.is_registered?
+
+ Yast.import "Installation"
+
+ config_params = {
+ :url => Helpers.registration_url,
+ :insecure => Helpers.insecure_registration
+ }
+
+ log.info "writing registration config: #{config_params}"
+
+ SUSE::Connect::YaST.write_config(config_params)
+
+ source_path = SUSE::Connect::Config::DEFAULT_CONFIG_FILE
+ target_path = Yast::Installation.destdir + source_path
+
+ Yast::WFM.Execute(Yast::Path.new(".local.bash"), "mv '#{source_path}' '#{target_path}'")
+
+ nil
+ else
+ raise "Uknown action #{func} passed as first parameter"
+ end
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.69/src/lib/registration/helpers.rb new/yast2-registration-3.1.72/src/lib/registration/helpers.rb
--- old/yast2-registration-3.1.69/src/lib/registration/helpers.rb 2014-06-10 11:13:03.000000000 +0200
+++ new/yast2-registration-3.1.72/src/lib/registration/helpers.rb 2014-06-11 16:21:21.000000000 +0200
@@ -25,6 +25,7 @@
require "uri"
require "registration/storage"
+require "suse/connect"
module Registration
@@ -139,8 +140,6 @@
version.sub(/-.*\z/, "")
end
- private
-
# get registration URL in installation mode
def self.reg_url_at_installation
# boot command line if present
@@ -224,12 +223,15 @@
# (the "reg_ssl_verify=0" boot commandline option is used)
def self.insecure_registration
# check the boot parameter only at installation/update
- return false unless Yast::Mode.installation || Yast::Mode.update
-
- reg_ssl_verify = Yast::Linuxrc.InstallInf("reg_ssl_verify")
- log.info "Boot reg_ssl_verify option: #{reg_ssl_verify.inspect}"
+ if Yast::Mode.installation || Yast::Mode.update
+ reg_ssl_verify = Yast::Linuxrc.InstallInf("reg_ssl_verify")
+ log.info "Boot reg_ssl_verify option: #{reg_ssl_verify.inspect}"
- reg_ssl_verify == "0"
+ return reg_ssl_verify == "0"
+ else
+ config = SUSE::Connect::Config.new
+ return config.insecure
+ end
end
# @param x509_name [OpenSSL::X509::Name] name object
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.69/src/lib/registration/ui/addon_eula_dialog.rb new/yast2-registration-3.1.72/src/lib/registration/ui/addon_eula_dialog.rb
--- old/yast2-registration-3.1.69/src/lib/registration/ui/addon_eula_dialog.rb 2014-06-10 11:13:03.000000000 +0200
+++ new/yast2-registration-3.1.72/src/lib/registration/ui/addon_eula_dialog.rb 2014-06-11 16:21:21.000000000 +0200
@@ -3,6 +3,9 @@
require "registration/eula_downloader"
require "registration/helpers"
+# TODO FIXME: this is used in a workaround, remove before RC/GM!!
+require "tempfile"
+
module Registration
module UI
@@ -18,6 +21,7 @@
Yast.import "ProductLicense"
Yast.import "Report"
Yast.import "Wizard"
+ Yast.import "InstShowInfo"
# create a new dialog for accepting importing a SSL certificate and run it
def self.run(selected_addons)
@@ -96,6 +100,9 @@
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.short_name)
+
base_product = false
action = "abort"
ret = Yast::ProductLicense.HandleLicenseDialogRet(arg_ref(eulas), base_product, action)
@@ -152,6 +159,38 @@
code.sub(/_.*\z/, "")
end
+ # TODO FIXME: this a workaround, remove before RC/GM!!
+ def display_beta_warning(addon_name)
+ beta_warning = <
participants (1)
-
bg